pullup from trunk To generate a diff of this commit: cvs diff -r5.34.2.2 -r5.34.2.3 krb5/src/config-files/ChangeLog cvs diff -r5.17.2.1 -r5.17.2.2 krb5/src/config-files/krb5.conf.M