# HG changeset patch
# User duke
# Date 1499266256 -7200
# Node ID 4c1404aa42cf8805abb53b3d34ad23e465750970
# Parent  357e7d58ea2f6a534b6c3f326b6d86c65bcc0f2b# Parent  c8e8487252e44734913214e0567aeff46afc690e
Merge

diff -r 357e7d58ea2f -r 4c1404aa42cf .hgtags-top-repo
--- a/.hgtags-top-repo	Tue Apr 14 04:21:02 2009 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 16:50:56 2017 +0200
@@ -28,3 +28,4 @@
 0f0189d55ce4a1f7840da7582ac7d970b3b7ab15 jdk7-b51
 4264c2fe66493e57c411045a1b61377796641e45 jdk7-b52
 c235f4a8559d196879c56af80159f67ee5d0e720 jdk7-b53
+2ef382b1bbd58a68e668391c6145a4b2066c5b96 jdk7-b54
diff -r 357e7d58ea2f -r 4c1404aa42cf hotspot/.hgtags
--- a/hotspot/.hgtags	Tue Apr 14 04:21:02 2009 -0700
+++ b/hotspot/.hgtags	Wed Jul 05 16:50:56 2017 +0200
@@ -28,3 +28,4 @@
 2581d90c6c9b2012da930eb4742add94a03069a0 jdk7-b51
 1b1e8f1a4fe8cebc01c022484f78148e17b62a0d jdk7-b52
 032c6af894dae8d939b3dd31d82042549e7793e0 jdk7-b53
+fafab5d5349c7c066d677538db67a1ee0fb33bd2 jdk7-b54