# HG changeset patch
# User never
# Date 1305242684 25200
# Node ID 3fd6f2d58ef3ad17b3181ee8ceb63c0fb8d8be02
# Parent  fabcf26ee72fb34e42c1b27b598de2564fb5fa0f# Parent  9ad1548c6b63d596c411afc35147ffd5254426d9
Merge

diff -r fabcf26ee72f -r 3fd6f2d58ef3 .hgtags
--- a/.hgtags	Thu May 12 14:04:48 2011 -0700
+++ b/.hgtags	Thu May 12 16:24:44 2011 -0700
@@ -166,3 +166,7 @@
 0930dc920c185afbf40fed9a655290b8e5b16783 hs21-b08
 611e19a16519d6fb5deea9ab565336e6e6ee475d jdk7-b139
 611e19a16519d6fb5deea9ab565336e6e6ee475d hs21-b09
+d283b82966712b353fa307845a1316da42a355f4 jdk7-b140
+d283b82966712b353fa307845a1316da42a355f4 hs21-b10
+5d07913abd59261c77f24cc04a759cb75d804099 jdk7-b141
+3aea9e9feb073f5500e031be6186666bcae89aa2 hs21-b11
diff -r fabcf26ee72f -r 3fd6f2d58ef3 make/hotspot_version
--- a/make/hotspot_version	Thu May 12 14:04:48 2011 -0700
+++ b/make/hotspot_version	Thu May 12 16:24:44 2011 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=21
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=11
+HS_BUILD_NUMBER=12
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7