# HG changeset patch
# User trims
# Date 1208903778 25200
# Node ID ad0b851458ff9d1d490ed2d79bb84f75a9fdb753
# Parent  8b0b3490194fb2239c272ec93f2e6b66e2fd358b# Parent  6cc3576e5142a09196ba43f8e11a32b8b78b5d5f
Merge

diff -r 6cc3576e5142 -r ad0b851458ff .hgtags
--- a/.hgtags	Wed Apr 16 15:34:39 2008 -0700
+++ b/.hgtags	Tue Apr 22 15:36:18 2008 -0700
@@ -1,1 +1,2 @@
 a61af66fc99eb5ec9d50c05b0c599757b1289ceb jdk7-b24
+7836be3e92d0a4f9ee7566f602c91f5609534e66 jdk7-b25