Merge jdk7u40-b30 into jdk7u60-b00
diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index d8fa0a3..f792650 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -314,3 +314,4 @@
 75167199239375d05b68668023c885c2776fd548 jdk7u40-b27
 ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28
 dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29
+1c141e6fde911c4974c87e340eb698754607f422 jdk7u40-b30
diff --git a/corba/.hgtags b/corba/.hgtags
index 09eafb7..ec5fb0c 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -316,3 +316,4 @@
 f745eeabb0eaabe8c0835c175b31f1e1c0f00bd4 jdk7u40-b27
 c8b9201f88f4ce417df7a40efcb7fef656d94512 jdk7u40-b28
 1ad0a5a3f7b1e9d95670d733d7e70714050ba6bf jdk7u40-b29
+651dcadbd9774165e017f8b7d1bde7d7d280ae1d jdk7u40-b30
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index 0426a80..ee88b09 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -507,3 +507,4 @@
 58e723f20009d2703eac040e324620949ca923fe hs24-b48
 d74376b0f20be7982d824e9af6105a75cc24e020 jdk7u40-b29
 88e43f47a8da8093743a1b6ca1ae4b79d994472a hs24-b49
+24f785f94d2f5be0f5c48e80f2a6cc7f8815dd8b jdk7u40-b30
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index b40e8b3..fc45f31 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -316,3 +316,4 @@
 7626b3fbc822fd4efd5ba3b5fc18f2fef5749597 jdk7u40-b27
 9186b6efd2b2eafa7fee5be1b043f59f25db12a6 jdk7u40-b28
 740942c76fb668a04bf89feccf069f6958651d54 jdk7u40-b29
+09b080236bc1a1a68f8b411196cbfa52475c0755 jdk7u40-b30
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index 7da1339..52511f6 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -316,3 +316,4 @@
 46ebac943288218b14d7ce3df23aa42a70fa4cf9 jdk7u40-b27
 016957700ac905ebf3432ae8ba17d3576a51e585 jdk7u40-b28
 15a82c84d9f7f6c99310380d4766fc68a3882671 jdk7u40-b29
+2f8f617ecc4f0772b090a3be742780d8375c68f6 jdk7u40-b30
diff --git a/jdk/.hgtags b/jdk/.hgtags
index df3e76a..fca3b45 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -321,3 +321,4 @@
 6ce66ba864780251fc44fff65358ef24f68ea51a jdk7u40-b27
 2043900095890e676f5ed0f959f470e2138c2a9a jdk7u40-b28
 d3186a0676dbc7ab80e00fa67f952b67933d5a35 jdk7u40-b29
+60d52db33828bf0355a94be2a82df90c901592f3 jdk7u40-b30
diff --git a/langtools/.hgtags b/langtools/.hgtags
index 537ba53..4838748 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -316,3 +316,4 @@
 12506bba2b67cd4b229550da67ff85b984549a28 jdk7u40-b27
 9f2eea2fae59c5242d1bb4cbca967bb6fbb99865 jdk7u40-b28
 bfe3575143fddbf71c2e570b580afef007d171e4 jdk7u40-b29
+0586afeb2caa0b4595bf5b306657a5dd1f0d121c jdk7u40-b30