# HG changeset patch
# User asaha
# Date 1412717671 25200
# Node ID ae2a038189317f2d96312ec01ae55bffb4ab6a51
# Parent  5f4937d4217e8e68708062f14519fe2169cc7ef8# Parent  f6bb51db3c9695cd89deaeb0d31fcb9e42436197
Merge

diff -r 5f4937d4217e -r ae2a03818931 .hgtags
--- a/.hgtags	Mon Oct 06 15:49:12 2014 -0700
+++ b/.hgtags	Tue Oct 07 14:34:31 2014 -0700
@@ -332,6 +332,7 @@
 09eaef69f384ecf8ec0342b87a8b150740941140 jdk8u25-b15
 f0a48c214c46b7351ff8e6d6b6dc533463a4be21 jdk8u25-b16
 d117f01bfb4f34668ac216c9837e88acead14dce jdk8u25-b17
+efac90a2da447c2b2d43ee1b1e20c0828659f9c5 jdk8u25-b18
 0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u40-b00
 f8736a40a35df0c8055c8a94b96e5381b381ad33 jdk8u40-b01
 b6a148730f2b14193c308bc9c866c36ee6c08ed3 jdk8u40-b02