# HG changeset patch
# User duke
# Date 1499268360 -7200
# Node ID 6f2ce34e48c68bd1ce96b04eaef9f2cf151c72b3
# Parent  4415519b35e26a49aec9efd5090f548c1bc2d54a# Parent  d238ad82a865067db34c94e57937802f3f7e4d40
Merge

diff -r 4415519b35e2 -r 6f2ce34e48c6 .hgtags-top-repo
--- a/.hgtags-top-repo	Thu Oct 28 13:31:36 2010 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 17:26:00 2017 +0200
@@ -90,3 +90,4 @@
 c1df968c4527bfab5f97662a89245f15d12d378b jdk7-b113
 27985a5c6e5268014d25d55886e0ecb96af4763d jdk7-b114
 e8ebdf41b9c01a26642848f4134f5504e8fb3233 jdk7-b115
+94e9a1bfba8b8d1fe0bfd43b88629b1f27b02a76 jdk7-b116
diff -r 4415519b35e2 -r 6f2ce34e48c6 corba/.hgtags
--- a/corba/.hgtags	Thu Oct 28 13:31:36 2010 -0700
+++ b/corba/.hgtags	Wed Jul 05 17:26:00 2017 +0200
@@ -90,3 +90,4 @@
 a89a6c5be9d1a754868d3d359cbf7ad36aa95631 jdk7-b113
 88fddb73c5c4a4b50c319cbae9380caf5172ab45 jdk7-b114
 da7561d479e0ddaa4650d8023ac0fc7294e014e3 jdk7-b115
+98c028de4301106f2285ac0e128a1bb9b4c24f5c jdk7-b116
diff -r 4415519b35e2 -r 6f2ce34e48c6 hotspot/.hgtags
--- a/hotspot/.hgtags	Thu Oct 28 13:31:36 2010 -0700
+++ b/hotspot/.hgtags	Wed Jul 05 17:26:00 2017 +0200
@@ -126,3 +126,4 @@
 68d6141ea19de3a9ba98ef753f0da41a61f736a0 jdk7-b114
 5511edd5d719f3fc9fdd04879482026a3d2c8652 hs20-b01
 bdbc48857210a509b3c50a3291ecb9dd6a72e016 jdk7-b115
+96b3f2a7add0b445b8aa421f6823cff5a2e2fe03 jdk7-b116
diff -r 4415519b35e2 -r 6f2ce34e48c6 jaxp/.hgtags
--- a/jaxp/.hgtags	Thu Oct 28 13:31:36 2010 -0700
+++ b/jaxp/.hgtags	Wed Jul 05 17:26:00 2017 +0200
@@ -90,3 +90,4 @@
 bc0c84ce54c34d3e8b0604b94da0d7c75c26755e jdk7-b113
 d57197d22c2bfc39d1a860040f655b466ab46f52 jdk7-b114
 dc1612e1d3ac08eb8fcad764daff21c9247d33c9 jdk7-b115
+f8d4e6c6cfce1cda23fcbd144628a9791a9e1a63 jdk7-b116
diff -r 4415519b35e2 -r 6f2ce34e48c6 jdk/.hgtags
--- a/jdk/.hgtags	Thu Oct 28 13:31:36 2010 -0700
+++ b/jdk/.hgtags	Wed Jul 05 17:26:00 2017 +0200
@@ -90,3 +90,4 @@
 61d3b9fbb26bdef56cfa41b9af5bc312a22cbeb8 jdk7-b113
 e250cef36ea05e627e7e6f7d75e5e19f529e2ba3 jdk7-b114
 449bad8d67b5808ecf0f927683acc0a5940f8c85 jdk7-b115
+1657ed4e1d86c8aa2028ab5a41f9da1ac4a369f8 jdk7-b116