# HG changeset patch
# User asaha
# Date 1411155336 25200
# Node ID 85e33a42e40b8e43906a231abe7d330ac0c1e9a2
# Parent  5f1518156bac5afd0a77bc31c5ff43075899eb74# Parent  a4f0c6dd8f97d4dd89baf09463c748abea9b3ed7
Merge

diff -r 5f1518156bac -r 85e33a42e40b .hgtags
--- a/.hgtags	Tue Sep 16 13:59:19 2014 -0700
+++ b/.hgtags	Fri Sep 19 12:35:36 2014 -0700
@@ -329,6 +329,7 @@
 a340d68b020585cad7aa6e38d1aafb19ad0e4e07 jdk8u25-b14
 6e0c19cd42d7c4d307bea26840ee831cbd14e2fc jdk8u25-b15
 7fa6fa7cc204de988e224c6f8f75e62128fa84cd jdk8u25-b16
+53ca196be1ae098466976c017b166d4ce180c36f jdk8u25-b17
 d231957fe3103e790465fcf058fb8cb33bbc4c4e jdk8u40-b00
 bf89a471779d13a9407f7d1c86f7716258bc4aa6 jdk8u40-b01
 0b6cc4ea670f5d17b56c088f202869bdbb80a5ce jdk8u40-b02