# HG changeset patch
# User asaha
# Date 1410980850 25200
# Node ID 85792859f3bdd6a2c1bdfcf2828bb2730e06ac3c
# Parent  02ed1ec7d75309edb1ed1fb877d8352c4cd4c94c# Parent  efac90a2da447c2b2d43ee1b1e20c0828659f9c5
Merge

diff -r 02ed1ec7d753 -r 85792859f3bd .hgtags
--- a/.hgtags	Thu Sep 11 13:40:19 2014 -0700
+++ b/.hgtags	Wed Sep 17 12:07:30 2014 -0700
@@ -332,4 +332,5 @@
 4429ea47ee6eca6b8a1dbda1950566ee821ba19d jdk8u25-b14
 09eaef69f384ecf8ec0342b87a8b150740941140 jdk8u25-b15
 f0a48c214c46b7351ff8e6d6b6dc533463a4be21 jdk8u25-b16
+d117f01bfb4f34668ac216c9837e88acead14dce jdk8u25-b17
 6db0898d3f90ad9eae2f017299314b88766446e3 jdk8u31-b00
diff -r 02ed1ec7d753 -r 85792859f3bd common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Thu Sep 11 13:40:19 2014 -0700
+++ b/common/autoconf/generated-configure.sh	Wed Sep 17 12:07:30 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=1403797630
+DATE_WHEN_GENERATED=1410971760
 
 ###############################################################################
 #