# HG changeset patch
# User trims
# Date 1238814774 25200
# Node ID fafab5d5349c7c066d677538db67a1ee0fb33bd2
# Parent  eae95c5579a4b64091ffe009d48c9c03ecf7627c# Parent  922aedc96ef5da2a3aebe795277e5f0797edf62e
Merge

diff -r 922aedc96ef5 -r fafab5d5349c .hgtags
--- a/.hgtags	Fri Apr 03 15:59:19 2009 -0700
+++ b/.hgtags	Fri Apr 03 20:12:54 2009 -0700
@@ -26,3 +26,5 @@
 8b22ccb5aba2c6c11bddf6488a7bb7ef5b4bf2be jdk7-b49
 dae503d9f04c1a11e182dbf7f770509c28dc0609 jdk7-b50
 2581d90c6c9b2012da930eb4742add94a03069a0 jdk7-b51
+1b1e8f1a4fe8cebc01c022484f78148e17b62a0d jdk7-b52
+032c6af894dae8d939b3dd31d82042549e7793e0 jdk7-b53
diff -r 922aedc96ef5 -r fafab5d5349c make/hotspot_version
--- a/make/hotspot_version	Fri Apr 03 15:59:19 2009 -0700
+++ b/make/hotspot_version	Fri Apr 03 20:12:54 2009 -0700
@@ -31,11 +31,11 @@
 #
 
 # Don't put quotes (fail windows build).
-HOTSPOT_VM_COPYRIGHT=Copyright 2008
+HOTSPOT_VM_COPYRIGHT=Copyright 2009
 
 HS_MAJOR_VER=15
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=04
+HS_BUILD_NUMBER=05
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7