# HG changeset patch
# User lana
# Date 1335225520 25200
# Node ID 8a3b65a2aab79fd36dc87f7519a2ed695832f61d
# Parent  7b5cbc36fac7a00d4d4a517f6eb7a01af0b68460# Parent  50b81d347c529f353f1162612745590403abdded
Merge

diff -r 50b81d347c52 -r 8a3b65a2aab7 .hgtags
--- a/.hgtags	Wed Apr 18 10:21:59 2012 -0700
+++ b/.hgtags	Mon Apr 23 16:58:40 2012 -0700
@@ -155,3 +155,4 @@
 bac81e9f7d57b75fba5ab31b571f3fe0dc08af69 jdk8-b31
 2c5208ccb863db936eab523f49450b3fcd230348 jdk8-b32
 a6e6d42203e6d35f9e8b31eac25b0021b4dd58ad jdk8-b33
+0ae89825c75c9492e44efb3aca3d9ee3d8a209df jdk8-b34
diff -r 50b81d347c52 -r 8a3b65a2aab7 .hgtags-top-repo
--- a/.hgtags-top-repo	Wed Apr 18 10:21:59 2012 -0700
+++ b/.hgtags-top-repo	Mon Apr 23 16:58:40 2012 -0700
@@ -155,3 +155,4 @@
 0b66f43b89a6c0ac1c15d7ec51992c541cdc9089 jdk8-b31
 88176171e940f02916a312c265a34c32552a8376 jdk8-b32
 42f275168fa5d9e7c70b246614dca8cf81f52c2e jdk8-b33
+894a478d2c4819a1a0f230bd7bdd09f3b2de9a8c jdk8-b34
diff -r 50b81d347c52 -r 8a3b65a2aab7 corba/.hgtags
--- a/corba/.hgtags	Wed Apr 18 10:21:59 2012 -0700
+++ b/corba/.hgtags	Mon Apr 23 16:58:40 2012 -0700
@@ -155,3 +155,4 @@
 1954151dfae8f73db24e396380f7c02bdd47c486 jdk8-b31
 5d820cb6b1afd75b619e7fd69e4f2b0eb1d5d6a1 jdk8-b32
 1e2ac1ea3f6c32a62bf88f3fa330120c30db59cb jdk8-b33
+e24c5cc8b0f7cc48374eef0f995838fb4823e0eb jdk8-b34
diff -r 50b81d347c52 -r 8a3b65a2aab7 hotspot/.hgtags
--- a/hotspot/.hgtags	Wed Apr 18 10:21:59 2012 -0700
+++ b/hotspot/.hgtags	Mon Apr 23 16:58:40 2012 -0700
@@ -238,3 +238,4 @@
 cd47da9383cd932cb2b659064057feafa2a91134 hs24-b06
 785bcf415ead2eaa5f6677aaf528481008140bac jdk8-b33
 7c6aba65acd2c334f1c3512b574f9038cddac24b hs24-b07
+f284b08835584517c1ca3dd67341f569e763841f jdk8-b34
diff -r 50b81d347c52 -r 8a3b65a2aab7 jaxp/.hgtags
--- a/jaxp/.hgtags	Wed Apr 18 10:21:59 2012 -0700
+++ b/jaxp/.hgtags	Mon Apr 23 16:58:40 2012 -0700
@@ -155,3 +155,4 @@
 94aabe098916440ae7911866311c9617d8481a36 jdk8-b31
 60960fbc75df8be4c1a2504aa69fc1428cc94f93 jdk8-b32
 9bcab2b8b8ea578e594916a3d3df6dbec7984bcb jdk8-b33
+8b91a897a04486cf901af0de7f684a3eb31f121f jdk8-b34
diff -r 50b81d347c52 -r 8a3b65a2aab7 jaxws/.hgtags
--- a/jaxws/.hgtags	Wed Apr 18 10:21:59 2012 -0700
+++ b/jaxws/.hgtags	Mon Apr 23 16:58:40 2012 -0700
@@ -155,3 +155,4 @@
 4c41c6d0e15de3b56919a5ba0a0f248a2d07f2b2 jdk8-b31
 017a7dbfaa92f5a8b144e6c890d1cebdaecaf681 jdk8-b32
 ea80b2388dce711fbde8e4fd6e07c2c64ad16743 jdk8-b33
+f1d020a49c8c33667fb10c8caa255206a78a3675 jdk8-b34
diff -r 50b81d347c52 -r 8a3b65a2aab7 jdk/.hgtags
--- a/jdk/.hgtags	Wed Apr 18 10:21:59 2012 -0700
+++ b/jdk/.hgtags	Mon Apr 23 16:58:40 2012 -0700
@@ -156,3 +156,4 @@
 ddfe5562f61f54ed2121ac0c73b688b94f3e66b5 jdk8-b32
 78cea258caaba3980ba186c426da82c8fe41bfd7 jdk8-b33
 29b680393f33bf953688c17d93aca7a870ca4024 jdk8-b34
+2e3e1356ffbddb2ae95c08da72830ba9ab8b3181 jdk8-b35
diff -r 50b81d347c52 -r 8a3b65a2aab7 jdk/makefiles/common/shared/Defs-utils.gmk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/makefiles/common/shared/Defs-utils.gmk	Mon Apr 23 16:58:40 2012 -0700
@@ -0,0 +1,2 @@
+# Purposely empty for now, should be removed eventually.
+
diff -r 50b81d347c52 -r 8a3b65a2aab7 langtools/.hgtags
--- a/langtools/.hgtags	Wed Apr 18 10:21:59 2012 -0700
+++ b/langtools/.hgtags	Mon Apr 23 16:58:40 2012 -0700
@@ -155,3 +155,4 @@
 b28cfbe7e8b196da954bed9a22bfd790e55333aa jdk8-b31
 be069d72dde2bfe6f996c46325a320961ca854c2 jdk8-b32
 46831c72b7f6c69fef2cc2935001863643a65f94 jdk8-b33
+6b105afbb77ca9600a99eade31f686d070c70581 jdk8-b34