# HG changeset patch
# User trims
# Date 1271383728 25200
# Node ID e16cca0aa5e16a2990f633a24ef8dba60cbc7441
# Parent  4c78b7c1682461e77ab87941704ced2e51e7a62d# Parent  fc3cd2277dc77b41ae89ca16d33201f0bd80aa0e
Merge

diff -r fc3cd2277dc7 -r e16cca0aa5e1 .hgtags
--- a/.hgtags	Tue Apr 13 13:01:37 2010 -0700
+++ b/.hgtags	Thu Apr 15 19:08:48 2010 -0700
@@ -86,3 +86,4 @@
 bf823ef06b4f211e66988d76a2e2669be5c0820e jdk7-b86
 07226e9eab8f74b37346b32715f829a2ef2c3188 hs18-b01
 e7e7e36ccdb5d56edd47e5744351202d38f3b7ad jdk7-b87
+4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b jdk7-b88
diff -r fc3cd2277dc7 -r e16cca0aa5e1 make/hotspot_version
--- a/make/hotspot_version	Tue Apr 13 13:01:37 2010 -0700
+++ b/make/hotspot_version	Thu Apr 15 19:08:48 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