# HG changeset patch
# User zgu
# Date 1342703750 14400
# Node ID 58a04a45a549a359c1830154017b59cf87f9898b
# Parent  d5bc62fcfac757695724b27e5c5ee4dc17d9d997# Parent  04a9b3789683264847f9f4cb7a20765c53c2b3bf
Merge

diff -r d5bc62fcfac7 -r 58a04a45a549 src/share/vm/services/memTracker.cpp