# HG changeset patch
# User acorn
# Date 1301529940 25200
# Node ID df553e4a797b996668ffcbc6a604778ccf80e69e
# Parent  bd586e392d93b7ed7a1636dcc8da2b6a4203a102# Parent  74e790c48cd4ec2e8a030a44146d87dca4ec98de
Merge

diff -r 74e790c48cd4 -r df553e4a797b .hgtags
--- a/.hgtags	Mon Mar 28 12:48:08 2011 +0200
+++ b/.hgtags	Wed Mar 30 17:05:40 2011 -0700
@@ -156,3 +156,5 @@
 1b3a350709e4325d759bb453ff3fb6a463270488 jdk7-b133
 447e6faab4a8755d4860c2366630729dbaec111c jdk7-b134
 3c76374706ea8a77e15aec8310e831e5734f8775 hs21-b04
+b898f0fc3cedc972d884d31a751afd75969531cf jdk7-b135
+b898f0fc3cedc972d884d31a751afd75969531cf hs21-b05
diff -r 74e790c48cd4 -r df553e4a797b make/hotspot_version
--- a/make/hotspot_version	Mon Mar 28 12:48:08 2011 +0200
+++ b/make/hotspot_version	Wed Mar 30 17:05:40 2011 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=21
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=05
+HS_BUILD_NUMBER=06
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7