# HG changeset patch
# User alanb
# Date 1249064590 -3600
# Node ID 4da41a764949751e515bc7f7cf9fcb33e846a89c
# Parent  8f6c0145dc8f8ccb5ffa9c60b7be978bab0b4e41# Parent  72bf5182bb8bcadf3a66217a6c3d05726e4e0184
Merge

diff -r 8f6c0145dc8f -r 4da41a764949 jdk/test/sun/security/krb5/ConfPlusProp.java
--- a/jdk/test/sun/security/krb5/ConfPlusProp.java	Fri Jul 31 08:45:30 2009 +0100
+++ b/jdk/test/sun/security/krb5/ConfPlusProp.java	Fri Jul 31 19:23:10 2009 +0100
@@ -23,7 +23,7 @@
 /*
  * @test
  * @bug 6857795
- * @buf 6858589
+ * @bug 6858589
  * @summary krb5.conf ignored if system properties on realm and kdc are provided
  */