# HG changeset patch
# User trims
# Date 1289546972 28800
# Node ID a1e319b5b13a455ad15bd5d3a857ab22f41f9270
# Parent  d4681dc649640e1047ba0c634c94f1bd546c3d25# Parent  84d114b9170e1224be6fadf51a330a3db7c56df2
Merge

diff -r 84d114b9170e -r a1e319b5b13a .hgtags
--- a/.hgtags	Thu Nov 11 17:36:50 2010 -0800
+++ b/.hgtags	Thu Nov 11 23:29:32 2010 -0800
@@ -129,3 +129,5 @@
 96b3f2a7add0b445b8aa421f6823cff5a2e2fe03 jdk7-b116
 52f19c724d9634af79044a2e0defbe4a5f1adbda hs20-b02
 806d0c037e6bbb88dac0699673f4ba55ee8c02da jdk7-b117
+698b7b727e12de44139d8cca6ab9a494ead13253 jdk7-b118
+3ef7426b4deac5dcfd4afb35cabe9ab3d666df91 hs20-b02