Merge

ec08634c · duke · a2d10def · 28b9ef9e · ec08634c · ec08634c
7 changed file
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -125,3 +125,4 @@ d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
 f42e3d9394b40a423d345b8da22687b5462e5f25 jdk8-b01
 69f592185747226a9c765a9fe139c1d34d616f9c jdk8-b02
 587bb549dff83131b65f40aa51864f69562f34a7 jdk8-b03
+0b66a233bfb9ba2ebda1e5cdfdb0373d6c1e3c69 jdk8-b04
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -125,3 +125,4 @@ a2f340a048c88d10cbedc0504f5cf03d39925a40 jdk7-b142
 949fb60ca830364571e7c4c9964e6b351ca929ec jdk8-b01
 ed8d94519a87b4adac270c3eec9134ff1f62bff5 jdk8-b02
 cd0da00694fbce642db9be936d3e4909a71d911d jdk8-b03
+60a68d688e24473cf84dedd1e60901a61ab82555 jdk8-b04
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -177,3 +177,4 @@ c149193c768b8b7233da4c3a3fdc0756b975848e jdk7-b143
 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
 3a2fb61165dfc72e398179a2796d740c8da5b8c0 jdk8-b03
+0fa3ace511fe98fe948e751531f3e2b7c60c8376 jdk8-b04
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -125,3 +125,4 @@ fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147
 4f0fcb812767594fe9de509f946b56942db5a2f0 jdk8-b01
 ca4d6ad55a660f0469882e85b4dacf7822d50abf jdk8-b02
 7a74371ce0c64108b857c497ae130dfe9514532c jdk8-b03
+acbcadef0b21582abf406f07f1b74d2b8f80dc01 jdk8-b04
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -125,3 +125,4 @@ d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147
 64df57a1edeca74388bd62f0a87d056db981fbdf jdk8-b01
 1034127ed402e9d0f1ed1477238ef594e9cc8da6 jdk8-b02
 7dcb0307508f408507d878cd7c2048c102b15158 jdk8-b03
+3f6f08163331ed75b30a6de1246670ce655645c8 jdk8-b04
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -125,3 +125,4 @@ f097ca2434b1412b12ab4a5c2397ce271bf681e7 jdk7-b147
 2cdbbc4a63592be7f1556fffe37b1253a77bd481 jdk8-b01
 13e70aa1398eb959c54bc68b783ca0eef1286ad2 jdk8-b02
 7989ee9fe673a87f4db3917fa6a005732a6a9b85 jdk8-b03
+fc569517f3cf242f90ce3503b743eb5553938946 jdk8-b04
--- a/jdk/src/share/classes/java/lang/VirtualMachineError.java
+++ b/jdk/src/share/classes/java/lang/VirtualMachineError.java
@@ -3,7 +3,7 @@
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, asP
+ * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the LICENSE file that accompanied this code.