diff -r f1431cace56e -r ed338593b0b6 test/tools/javac/Diagnostics/6860795/T6860795.out
--- a/test/tools/javac/Diagnostics/6860795/T6860795.out	Mon Sep 12 11:40:07 2011 -0700
+++ b/test/tools/javac/Diagnostics/6860795/T6860795.out	Tue Sep 13 14:14:57 2011 +0100
@@ -1,2 +1,2 @@
-T6860795.java:10:27: compiler.err.already.defined: x, foo
+T6860795.java:10:27: compiler.err.already.defined: kindname.variable, x, kindname.method, foo
 1 error