# HG changeset patch
# User jrose
# Date 1271837595 25200
# Node ID ba07d5be2d51bfd0ae69b43699dfe873cb868e97
# Parent  bc32f286fae0b72b69b02b2843db19d5cea7a31c# Parent  605c9707a766ff518cd841fc04f9bb4b36a3a30b
Merge

diff -r bc32f286fae0 -r ba07d5be2d51 .hgtags
--- a/.hgtags	Tue Apr 20 13:26:33 2010 -0700
+++ b/.hgtags	Wed Apr 21 01:13:15 2010 -0700
@@ -86,3 +86,6 @@
 bf823ef06b4f211e66988d76a2e2669be5c0820e jdk7-b86
 07226e9eab8f74b37346b32715f829a2ef2c3188 hs18-b01
 e7e7e36ccdb5d56edd47e5744351202d38f3b7ad jdk7-b87
+4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b jdk7-b88
+15836273ac2494f36ef62088bc1cb6f3f011f565 jdk7-b89
+4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b hs18-b02
diff -r bc32f286fae0 -r ba07d5be2d51 make/hotspot_version
--- a/make/hotspot_version	Tue Apr 20 13:26:33 2010 -0700
+++ b/make/hotspot_version	Wed Apr 21 01:13:15 2010 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=18
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=02
+HS_BUILD_NUMBER=03
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7