pullup from trunk To generate a diff of this commit: cvs diff -r5.34 -r5.34.2.1 krb5/src/config-files/ChangeLog cvs diff -r5.10 -r5.10.2.1 krb5/src/config-files/kdc.conf.M