# HG changeset patch
# User tonyp
# Date 1263489613 28800
# Node ID 22e27cceb7d818b249ccfc12af71699f1fe61b31
# Parent  7b0e9cba0307c01fac0ff1372c18427fd0a30f3f# Parent  0c1bf505f7a27c618ed229cb1e6cf727434944ac
Merge

diff -r 7b0e9cba0307 -r 22e27cceb7d8 src/share/vm/runtime/globals.hpp