# HG changeset patch
# User trims
# Date 1261528426 28800
# Node ID 22e4972db0a68b6fed17a227c48054a65cce9bb5
# Parent  61b46f7853d415db263c7bcfa4bda58b32962e3f# Parent  cf9a9a50e763f4901901e74f94b5d26e0f387203
Merge

diff -r cf9a9a50e763 -r 22e4972db0a6 .hgignore
--- a/.hgignore	Thu Dec 17 07:02:39 2009 -0800
+++ b/.hgignore	Tue Dec 22 16:33:46 2009 -0800
@@ -1,6 +1,6 @@
 ^build/
 ^dist/
-^nbproject/private/
+/nbproject/private/
 ^src/share/tools/hsdis/build/
 ^src/share/tools/IdealGraphVisualizer/[a-zA-Z0-9]*/build/
 ^src/share/tools/IdealGraphVisualizer/build/
diff -r cf9a9a50e763 -r 22e4972db0a6 .hgtags
--- a/.hgtags	Thu Dec 17 07:02:39 2009 -0800
+++ b/.hgtags	Tue Dec 22 16:33:46 2009 -0800
@@ -50,3 +50,6 @@
 faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73
 f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74
 d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75
+9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76
+455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77
+e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78