# HG changeset patch
# User lana
# Date 1343949521 25200
# Node ID 91aef25d0bc10c319c72075cdb13a6d957c01988
# Parent  446a7548357b64ff80a6a965cc72010ed72dea8d# Parent  dd1e513c05b8b8c8402e9ecf9c0d5bdbebb1a089
Merge

diff -r 446a7548357b -r 91aef25d0bc1 .hgtags
--- a/.hgtags	Wed May 23 12:37:31 2012 +0800
+++ b/.hgtags	Thu Aug 02 16:18:41 2012 -0700
@@ -194,3 +194,4 @@
 4a6917092af80481c1fa5b9ec8ccae75411bb72c jdk7u6-b18
 a263f787ced5bc7c14078ae552c82de6bd011611 jdk7u6-b19
 09145b546a2b6ae1f44d5c8a7d2a37d48e4b39e2 jdk7u6-b20
+df945ef30444adf08f3ef14b0c49c8bda6dda587 jdk7u8-b01