# HG changeset patch
# User trims
# Date 1303523542 25200
# Node ID 83fccfbfe47b61a9df557a3f53d0c5d31da1ecbf
# Parent  7b4fb6089361c172cc3f8f66273df03582a959be# Parent  732454aaf5cb6d8baf2602e9d7dee92856457cd6
Merge

diff -r 732454aaf5cb -r 83fccfbfe47b .hgtags
--- a/.hgtags	Wed Apr 20 20:32:45 2011 -0700
+++ b/.hgtags	Fri Apr 22 18:52:22 2011 -0700
@@ -162,3 +162,7 @@
 bd586e392d93b7ed7a1636dcc8da2b6a4203a102 hs21-b06
 2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f jdk7-b137
 2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f hs21-b07
+0930dc920c185afbf40fed9a655290b8e5b16783 jdk7-b138
+0930dc920c185afbf40fed9a655290b8e5b16783 hs21-b08
+611e19a16519d6fb5deea9ab565336e6e6ee475d jdk7-b139
+611e19a16519d6fb5deea9ab565336e6e6ee475d hs21-b09
diff -r 732454aaf5cb -r 83fccfbfe47b make/hotspot_version
--- a/make/hotspot_version	Wed Apr 20 20:32:45 2011 -0700
+++ b/make/hotspot_version	Fri Apr 22 18:52:22 2011 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=21
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=08
+HS_BUILD_NUMBER=09
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7