# HG changeset patch
# User asaha
# Date 1411163785 25200
# Node ID dbbca883b08f9654ab0c88cca56189eddcfbe9c7
# Parent  6cb87661323015fdbbc07d0abb83b1e9f5bf04af# Parent  efac90a2da447c2b2d43ee1b1e20c0828659f9c5
Merge

diff -r 6cb876613230 -r dbbca883b08f .hgtags
--- a/.hgtags	Fri Sep 19 11:29:15 2014 -0700
+++ b/.hgtags	Fri Sep 19 14:56:25 2014 -0700
@@ -331,6 +331,7 @@
 4429ea47ee6eca6b8a1dbda1950566ee821ba19d jdk8u25-b14
 09eaef69f384ecf8ec0342b87a8b150740941140 jdk8u25-b15
 f0a48c214c46b7351ff8e6d6b6dc533463a4be21 jdk8u25-b16
+d117f01bfb4f34668ac216c9837e88acead14dce jdk8u25-b17
 0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u40-b00
 f8736a40a35df0c8055c8a94b96e5381b381ad33 jdk8u40-b01
 b6a148730f2b14193c308bc9c866c36ee6c08ed3 jdk8u40-b02
diff -r 6cb876613230 -r dbbca883b08f common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Fri Sep 19 11:29:15 2014 -0700
+++ b/common/autoconf/generated-configure.sh	Fri Sep 19 14:56:25 2014 -0700
@@ -3868,7 +3868,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1410475208
+DATE_WHEN_GENERATED=1411155242
 
 ###############################################################################
 #