# HG changeset patch
# User xlu
# Date 1256751437 25200
# Node ID d912f17c1ae48e5c78834ffeab2efdd1adcd15ab
# Parent  a3b9e96881fe15b91b94ebd412bccbf81c8ceaab# Parent  d8dd291a362acb656026a9c0a9da48501505a1e7
Merge

diff -r a3b9e96881fe -r d912f17c1ae4 .hgtags
--- a/.hgtags	Fri Oct 23 18:44:33 2009 -0700
+++ b/.hgtags	Wed Oct 28 10:37:17 2009 -0700
@@ -48,3 +48,4 @@
 50a95aa4a247f0cbbf66df285a8b1d78ffb153d9 jdk7-b71
 a94714c550658fd6741793ef036cb9625dc2ab1a jdk7-b72
 faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73
+f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74
diff -r a3b9e96881fe -r d912f17c1ae4 make/hotspot_version
--- a/make/hotspot_version	Fri Oct 23 18:44:33 2009 -0700
+++ b/make/hotspot_version	Wed Oct 28 10:37:17 2009 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=17
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=03
+HS_BUILD_NUMBER=04
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7