# HG changeset patch
# User trims
# Date 1247307510 25200
# Node ID 218f6b67f9c50e9429e94ba674a924c81b7f0593
# Parent  45c4b1fe45e41d560ccf63a36b2b63a62423fd86# Parent  bb18957ad21eaf5b36e50f0e7f35b1121ff19ba2
Merge

diff -r bb18957ad21e -r 218f6b67f9c5 .hgtags
--- a/.hgtags	Fri Jul 10 16:01:20 2009 -0700
+++ b/.hgtags	Sat Jul 11 03:18:30 2009 -0700
@@ -37,3 +37,4 @@
 a77eddcd510c3972717c025cfcef9a60bfa4ecac jdk7-b60
 27b728fd1281ab62e9d7e4424f8bbb6ca438d803 jdk7-b61
 a88386380bdaaa5ab4ffbedf22c57bac5dbec034 jdk7-b62
+32c83fb84370a35344676991a48440378e6b6c8a jdk7-b63
diff -r bb18957ad21e -r 218f6b67f9c5 make/hotspot_version
--- a/make/hotspot_version	Fri Jul 10 16:01:20 2009 -0700
+++ b/make/hotspot_version	Sat Jul 11 03:18:30 2009 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=16
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=05
+HS_BUILD_NUMBER=06
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7