# HG changeset patch
# User kamg
# Date 1227646763 18000
# Node ID a60eabc24e2c515c880d6059ec2e94de6513b29e
# Parent  b22701a8b88f4e925ece9898af8dd6b2449fd7c9# Parent  f9d938ede1960d18cb7cf23c645b026519c1a678
Merge

diff -r b22701a8b88f -r a60eabc24e2c .hgtags
--- a/.hgtags	Mon Nov 24 14:45:47 2008 -0500
+++ b/.hgtags	Tue Nov 25 15:59:23 2008 -0500
@@ -14,3 +14,4 @@
 9ee9cf798b59e7d51f8c0a686959f313867a55d6 jdk7-b37
 d9bc824aa078573829bb66572af847e26e1bd12e jdk7-b38
 49ca90d77f34571b0757ebfcb8a7848ef2696b88 jdk7-b39
+81a0cbe3b28460ce836109934ece03db7afaf9cc jdk7-b40
diff -r b22701a8b88f -r a60eabc24e2c make/hotspot_version
--- a/make/hotspot_version	Mon Nov 24 14:45:47 2008 -0500
+++ b/make/hotspot_version	Tue Nov 25 15:59:23 2008 -0500
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=14
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=07
+HS_BUILD_NUMBER=08
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7