# HG changeset patch
# User trims
# Date 1269568387 25200
# Node ID bc7a1618e0994c79552a525db815c66c5c47cf40
# Parent  bdf64657de2a03db30a49080b4504dbb5629dcb8# Parent  f1f9af4b8e4e2ba90b37d29963ff79c32b1b65a0
Merge

diff -r bdf64657de2a -r bc7a1618e099 .hgtags
--- a/.hgtags	Thu Mar 25 18:49:43 2010 -0700
+++ b/.hgtags	Thu Mar 25 18:53:07 2010 -0700
@@ -82,3 +82,4 @@
 3f370a32906eb5ba993fabd7b4279be7f31052b9 jdk7-b83
 ffc8d176b84bcfb5ac21302b4feb3b0c0d69b97c jdk7-b84
 6c9796468b91dcbb39e09dfa1baf9779ac45eb66 hs17-b10
+23decd59cae719a69aa18049511010b9df287025 hs17-b11