# HG changeset patch
# User acorn
# Date 1270169330 14400
# Node ID 4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b
# Parent  7c358fbb6a848047218dd8708a62708db7fd982b# Parent  096b18156d91a9526230f8d433e795c0812215e4
Merge

diff -r 7c358fbb6a84 -r 4b60f23c4223 .hgtags
--- a/.hgtags	Thu Apr 01 11:23:01 2010 -0400
+++ b/.hgtags	Thu Apr 01 20:48:50 2010 -0400
@@ -83,3 +83,6 @@
 ffc8d176b84bcfb5ac21302b4feb3b0c0d69b97c jdk7-b84
 6c9796468b91dcbb39e09dfa1baf9779ac45eb66 jdk7-b85
 418bc80ce13995149eadc9eecbba21d7a9fa02ae hs17-b10
+bf823ef06b4f211e66988d76a2e2669be5c0820e jdk7-b86
+07226e9eab8f74b37346b32715f829a2ef2c3188 hs18-b01
+e7e7e36ccdb5d56edd47e5744351202d38f3b7ad jdk7-b87
diff -r 7c358fbb6a84 -r 4b60f23c4223 make/hotspot_version
--- a/make/hotspot_version	Thu Apr 01 11:23:01 2010 -0400
+++ b/make/hotspot_version	Thu Apr 01 20:48:50 2010 -0400
@@ -31,11 +31,11 @@
 #
 
 # Don't put quotes (fail windows build).
-HOTSPOT_VM_COPYRIGHT=Copyright 2009
+HOTSPOT_VM_COPYRIGHT=Copyright 2010
 
-HS_MAJOR_VER=17
+HS_MAJOR_VER=18
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=10
+HS_BUILD_NUMBER=02
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7