commit 467ecd371e3d96f320e109c0dd162a1e3cba2fa1
author trims <none@none> Fri Apr 03 20:12:54 2009 -0700
committer trims <none@none> Fri Apr 03 20:12:54 2009 -0700
tree 6c9ae962a3fa853bc5f34867505dfa0f1b8c4584
parent 12134966a3c126a73912f6b3a0b757c9b84fa29d
parent fa2543c44c2f6ca56e0893f82830cd327cff3600

Merge

.hgtags

diff --git a/.hgtags b/.hgtags
index 21dac82..30fc9e5 100644
--- a/.hgtags
+++ b/.hgtags
@@ -26,3 +26,5 @@
 8b22ccb5aba2c6c11bddf6488a7bb7ef5b4bf2be jdk7-b49
 dae503d9f04c1a11e182dbf7f770509c28dc0609 jdk7-b50
 2581d90c6c9b2012da930eb4742add94a03069a0 jdk7-b51
+1b1e8f1a4fe8cebc01c022484f78148e17b62a0d jdk7-b52
+032c6af894dae8d939b3dd31d82042549e7793e0 jdk7-b53

make/hotspot_version

diff --git a/make/hotspot_version b/make/hotspot_version
index f3f6bc5..64a2efe 100644
--- a/make/hotspot_version
+++ b/make/hotspot_version
@@ -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