# HG changeset patch
# User trims
# Date 1305263104 25200
# Node ID a7ccd5419f48010dc0e0519c42bfd81f97f89a8c
# Parent  0effff0c9721289f652ca7facc0ff31140587c0d# Parent  688202ef630643ecf174d196252e925f329149e4
Merge

diff -r 688202ef6306 -r a7ccd5419f48 .hgtags
--- a/.hgtags	Thu May 12 19:39:58 2011 -0700
+++ b/.hgtags	Thu May 12 22:05:04 2011 -0700
@@ -170,3 +170,5 @@
 d283b82966712b353fa307845a1316da42a355f4 hs21-b10
 5d07913abd59261c77f24cc04a759cb75d804099 jdk7-b141
 3aea9e9feb073f5500e031be6186666bcae89aa2 hs21-b11
+9ad1548c6b63d596c411afc35147ffd5254426d9 jdk7-b142
+9ad1548c6b63d596c411afc35147ffd5254426d9 hs21-b12