# HG changeset patch
# User herrick
# Date 1245085638 14400
# Node ID c7c4850f1478235ace00144765104dd1dbf7069c
# Parent  c50469cf63cd5d69cb5b02dc4a663c97f35d794f# Parent  472c21584cfd7e9c0229ad6a100366a5c03d2976
Merge

diff -r c50469cf63cd -r c7c4850f1478 .hgtags
--- a/.hgtags	Thu Jun 11 15:15:49 2009 -0400
+++ b/.hgtags	Mon Jun 15 13:07:18 2009 -0400
@@ -34,3 +34,4 @@
 ffd09e767dfa6d21466183a400f72cf62d53297f jdk7-b57
 59b497130f82ec809c245ffb5e521e3a5fabf8af jdk7-b58
 030142474602b4a067662fffc0c8e541de5a78df jdk7-b59
+39565502682c7085369bd09e51640919dc741097 jdk7-b60
diff -r c50469cf63cd -r c7c4850f1478 make/sanity-rules.gmk
--- a/make/sanity-rules.gmk	Thu Jun 11 15:15:49 2009 -0400
+++ b/make/sanity-rules.gmk	Mon Jun 15 13:07:18 2009 -0400
@@ -348,6 +348,8 @@
 ifeq ($(SPONSORS_SRC_AVAILABLE), true)
 	@$(ECHO) "   BUILD_SPONSORS = $(BUILD_SPONSORS) " >> $(MESSAGE_FILE)
 endif
+	@$(ECHO) "   DEBUG_CLASSFILES = $(DEBUG_CLASSFILES) " >> $(MESSAGE_FILE)
+	@$(ECHO) "   DEBUG_BINARIES = $(DEBUG_BINARIES) " >> $(MESSAGE_FILE)
 	@$(ECHO) "" >> $(MESSAGE_FILE)
 
 .PHONY: sanity settings pre-sanity insane \