# HG changeset patch
# User trims
# Date 1220578843 25200
# Node ID 5fa96a5a7e76da7c8dad12486293a0456c2c116c
# Parent  5c7c20a84e4109bdadf1bd5f1f1a37da494ce27b# Parent  3a26e9e4be71d95d53a77bef5c0f887504ba03df
Merge

diff -r 3a26e9e4be71 -r 5fa96a5a7e76 .hgtags
--- a/.hgtags	Wed Sep 03 14:57:00 2008 -0700
+++ b/.hgtags	Thu Sep 04 18:40:43 2008 -0700
@@ -8,3 +8,4 @@
 9c2ecc2ffb125f14fab3857fe7689598956348a0 jdk7-b31
 b727c32788a906c04839516ae7443a085185a300 jdk7-b32
 585535ec8a14adafa6bfea65d6975e29094c8cec jdk7-b33
+5251a9cd8eb8743eee647365bee1c8afdc131556 jdk7-b34
diff -r 3a26e9e4be71 -r 5fa96a5a7e76 make/hotspot_version
--- a/make/hotspot_version	Wed Sep 03 14:57:00 2008 -0700
+++ b/make/hotspot_version	Thu Sep 04 18:40:43 2008 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=14
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=03
+HS_BUILD_NUMBER=04
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7