# HG changeset patch
# User sla
# Date 1358532821 -3600
# Node ID 617b18aadb337b2d01fbeeda974a170617e0b2b9
# Parent  46e60405583bb0c0578d4f573d4db97f83ee41bb# Parent  557bda927cc233fea59668661b91dbdd936c26f5
Merge

diff -r 557bda927cc2 -r 617b18aadb33 .hgtags
--- a/.hgtags	Fri Jan 18 14:15:51 2013 +0100
+++ b/.hgtags	Fri Jan 18 19:13:41 2013 +0100
@@ -307,3 +307,5 @@
 0847210f85480bf3848dc90bc2ab23c0a4791b55 jdk8-b71
 d5cb5830f570d1304ea4b196dde672a291b55f29 jdk8-b72
 1e129851479e4f5df439109fca2c7be1f1613522 hs25-b15
+11619f33cd683c2f1d6ef72f1c6ff3dacf5a9f1c jdk8-b73
+70c89bd6b895a10d25ca70e08093c09ff2005fda hs25-b16
diff -r 557bda927cc2 -r 617b18aadb33 make/hotspot_version
--- a/make/hotspot_version	Fri Jan 18 14:15:51 2013 +0100
+++ b/make/hotspot_version	Fri Jan 18 19:13:41 2013 +0100
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=16
+HS_BUILD_NUMBER=17
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8