# HG changeset patch
# User tonyp
# Date 1319821450 14400
# Node ID 59519b7d7b9df9f13403a158490b2432493239b6
# Parent  8487c835efbfd2ff42f829726f46f7fc1ea909b5# Parent  5a5ed80bea5bbf9dbd166c4fc9a091fab0666570
Merge

diff -r 5a5ed80bea5b -r 59519b7d7b9d .hgtags
--- a/.hgtags	Wed Oct 26 21:07:52 2011 -0700
+++ b/.hgtags	Fri Oct 28 13:04:10 2011 -0400
@@ -191,3 +191,5 @@
 49ed7eacfd16616166ff066493143889741097af jdk8-b08
 7c20d272643f47195478708eff593a9cce40fec4 jdk8-b09
 e4f412d2b75d2c797acff965aa2c420e3d358f09 hs23-b02
+d815de2e85e511b7deab2a83cf80c0224d011da9 jdk8-b10
+4d3850d9d326ac3a9bee2d867727e954322d014e hs23-b03
diff -r 5a5ed80bea5b -r 59519b7d7b9d make/hotspot_version
--- a/make/hotspot_version	Wed Oct 26 21:07:52 2011 -0700
+++ b/make/hotspot_version	Fri Oct 28 13:04:10 2011 -0400
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=23
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=03
+HS_BUILD_NUMBER=04
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8