# HG changeset patch
# User jmasa
# Date 1245422005 25200
# Node ID 85d0690f7d12b2e6ebc099ecbfd728179dd553b6
# Parent  3104f76478ee9cc87107e046ddd37100fc4034f8# Parent  830ca2573896ad3a83aef22397864fb887af1efb
Merge

diff -r 830ca2573896 -r 85d0690f7d12 .hgtags
--- a/.hgtags	Fri Jun 12 16:20:16 2009 -0400
+++ b/.hgtags	Fri Jun 19 07:33:25 2009 -0700
@@ -33,3 +33,5 @@
 a3fd9e40ff2e854f6169eb6d09d491a28634d04f jdk7-b56
 f4cbf78110c726919f46b59a3b054c54c7e889b4 jdk7-b57
 53d9bf689e80fcc76b221bbe6c5d58e08b80cbc6 jdk7-b58
+c55be0c7bd32c016c52218eb4c8b5da8a75450b5 jdk7-b59
+a77eddcd510c3972717c025cfcef9a60bfa4ecac jdk7-b60
diff -r 830ca2573896 -r 85d0690f7d12 make/README
--- a/make/README	Fri Jun 12 16:20:16 2009 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-README:
-  This file should be located at the top of the hotspot Mercurial repository.
-
-  See http://openjdk.java.net/ for more information about the OpenJDK.
-
-  See ../README-builds.html for complete details on build machine requirements.
-
-Simple Build Instructions:
-
-    cd make && gnumake
-     
-  The files that will be imported into the jdk build will be in the "build"
-  directory.
-
diff -r 830ca2573896 -r 85d0690f7d12 make/hotspot_version
--- a/make/hotspot_version	Fri Jun 12 16:20:16 2009 -0400
+++ b/make/hotspot_version	Fri Jun 19 07:33:25 2009 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=16
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=03
+HS_BUILD_NUMBER=04
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7