# HG changeset patch
# User dcubed
# Date 1296106012 28800
# Node ID 515cc1a31fd127bb8a424b754280003124714b7e
# Parent  d19d8218a3990fe8f90149581ef2097ae93e328f# Parent  ccfcb502af3f359c0a4193089ec04c4417b2af67
Merge

diff -r ccfcb502af3f -r 515cc1a31fd1 .hgtags
--- a/.hgtags	Tue Jan 25 00:14:21 2011 -0500
+++ b/.hgtags	Wed Jan 26 21:26:52 2011 -0800
@@ -143,3 +143,4 @@
 e24ab3fa6aafad3efabbe7dba9918c5f461a20b1 jdk7-b125
 4c851c931d001a882cab809aaf3a55371b919244 jdk7-b126
 e24ab3fa6aafad3efabbe7dba9918c5f461a20b1 hs20-b06
+d535bf4c12355a2897e918da9f8910c0aceec4fb hs20-b07
diff -r ccfcb502af3f -r 515cc1a31fd1 make/hotspot_version
--- a/make/hotspot_version	Tue Jan 25 00:14:21 2011 -0500
+++ b/make/hotspot_version	Wed Jan 26 21:26:52 2011 -0800
@@ -33,9 +33,9 @@
 # Don't put quotes (fail windows build).
 HOTSPOT_VM_COPYRIGHT=Copyright 2011
 
-HS_MAJOR_VER=20
+HS_MAJOR_VER=21
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=07
+HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7