# HG changeset patch
# User dcubed
# Date 1222955686 25200
# Node ID c005b6eac36e1288fd6ca5f59b831599b3e51c88
# Parent  af90fe21c1e37297eeb0c3621d508c63e7da6269# Parent  b7483806cc4960817546f4de8cb87bef3adb18f5
Merge

diff -r b7483806cc49 -r c005b6eac36e .hgtags
--- a/.hgtags	Wed Oct 01 20:15:03 2008 -0400
+++ b/.hgtags	Thu Oct 02 06:54:46 2008 -0700
@@ -10,3 +10,4 @@
 585535ec8a14adafa6bfea65d6975e29094c8cec jdk7-b33
 5251a9cd8eb8743eee647365bee1c8afdc131556 jdk7-b34
 5fa96a5a7e76da7c8dad12486293a0456c2c116c jdk7-b35
+e91159f921a58af3698e6479ea1fc5818da66d09 jdk7-b36
diff -r b7483806cc49 -r c005b6eac36e make/hotspot_version
--- a/make/hotspot_version	Wed Oct 01 20:15:03 2008 -0400
+++ b/make/hotspot_version	Thu Oct 02 06:54:46 2008 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=14
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=05
+HS_BUILD_NUMBER=06
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7