# HG changeset patch
# User trims
# Date 1282302488 25200
# Node ID 09cdb1e1c77b089ae9518de6626d1a83a76d3b00
# Parent  0e509ddd99627b57e4f25541ed9c9d245f82f7e6# Parent  1b0104ab1e5e3a30d77bf6d9ea0296d176e4ce59
Merge

diff -r 1b0104ab1e5e -r 09cdb1e1c77b .hgtags
--- a/.hgtags	Thu Aug 19 14:08:58 2010 -0400
+++ b/.hgtags	Fri Aug 20 04:08:08 2010 -0700
@@ -111,3 +111,6 @@
 e55900b5c1b865cac17e18abc639c7dc50de7fd8 hs19-b04
 b4acf10eb134fe930802c97e36db65e7ccb544b5 jdk7-b104
 6709c14587c2cc6faca208767335afeb01e33de5 jdk7-b105
+1b81ca701fa5fc30adc4cfdaa4bdd153df5e6c86 jdk7-b106
+cc3fdfeb54b049f18edcf3463e6ab051d0b7b609 hs19-b05
+688a538aa65412178286ae2a6b0c00b6711e121b hs19-b06
diff -r 1b0104ab1e5e -r 09cdb1e1c77b make/hotspot_version
--- a/make/hotspot_version	Thu Aug 19 14:08:58 2010 -0400
+++ b/make/hotspot_version	Fri Aug 20 04:08:08 2010 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=19
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=06
+HS_BUILD_NUMBER=07
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7