pullup from trunk To generate a diff of this commit: cvs diff -r1.42.2.12.2.2 -r1.42.2.12.2.3 krb5/doc/ChangeLog cvs diff -r0 -r1.1.2.1 krb5/doc/krb4-xrealm.txt