# HG changeset patch
# User tbell
# Date 1227309672 28800
# Node ID d255ae63f83c2c22e600b436e93ed2a158feba80
# Parent  81388748f694a4976b0ae8ceb9d503ff14af3fe3# Parent  7d2f47b8f437554df90c4334d359420098ca9090
Merge

diff -r 81388748f694 -r d255ae63f83c jdk/.hgtags
--- a/jdk/.hgtags	Fri Nov 14 17:22:10 2008 +0100
+++ b/jdk/.hgtags	Fri Nov 21 15:21:12 2008 -0800
@@ -14,3 +14,4 @@
 14f50aee4989b75934d385c56a83da0c23d2f68b jdk7-b37
 cc5f810b5af8a3a83b0df5a29d9e24d7a0ff8086 jdk7-b38
 4e51997582effa006dde5c6d8b8820b2045b9c7f jdk7-b39
+2201dad60231a3c3e0346e3a0250d69ca3b71fd4 jdk7-b40