# HG changeset patch
# User michaelm
# Date 1325755591 0
# Node ID 2fea92d741b70dbc27f8ca6d82b86ecb310d9e1d
# Parent  cb4d467b5794280f4ecdd52c6ec11af497f25cbf# Parent  1231e80827d00f24095e7bb16ca87d304aa2bf6b
Merge

diff -r cb4d467b5794 -r 2fea92d741b7 .hgtags
--- a/.hgtags	Thu Dec 29 09:21:08 2011 -0800
+++ b/.hgtags	Thu Jan 05 09:26:31 2012 +0000
@@ -142,3 +142,6 @@
 c95558e566ac3605c480a3d070b1102088dab07f jdk7u2-b13
 e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u2-b21
 25457f672756f16fed69a172c602fd9aca087413 jdk7u4-b200
+bcc37b8ac1b07b74516bbd97183e84b7eb224d8e jdk7u4-b04
+870fd5101f66e4ec81ae0491166efb64d9b65155 jdk7u4-b02
+a15712a2304e23252c9f3e4da3fc36cd7098a785 jdk7u4-b05
\ No newline at end of file