# HG changeset patch
# User asaha
# Date 1397667114 25200
# Node ID 526a628b7b248051153fd88bb8e9126f8af6f4b7
# Parent  096a7e12d63fc1b66ba258b82e4509cbf1b0c917# Parent  0ab62d80a754e61ae3c8865d4fb46ce589460a99
Merge

diff -r 096a7e12d63f -r 526a628b7b24 .hgtags
--- a/.hgtags	Tue Apr 15 16:17:20 2014 -0400
+++ b/.hgtags	Wed Apr 16 09:51:54 2014 -0700
@@ -438,3 +438,6 @@
 8a67179106085689906732013a282efeeb9bd5f4 jdk8u5-b13
 f0d759a6a2309a1c149d530b29db24eda885f267 jdk8u11-b01
 3c079aebb516765784dd8097887daadda5a76ac1 jdk8u11-b02
+0037e964ce486c009984171f004259263628079f jdk8u11-b03
+4c40343ecdb33fe046833fe4b8970fd29859c4ad jdk8u11-b04
+a4d44dfb7d30eea54bc172e4429a655454ae0bbf jdk8u25-b00
diff -r 096a7e12d63f -r 526a628b7b24 make/hotspot_version
--- a/make/hotspot_version	Tue Apr 15 16:17:20 2014 -0400
+++ b/make/hotspot_version	Wed Apr 16 09:51:54 2014 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=11
-HS_BUILD_NUMBER=01
+HS_BUILD_NUMBER=02
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8