pullup from trunk To generate a diff of this commit: cvs diff -r5.229 -r5.229.4.1 krb5/src/config/ChangeLog cvs diff -r1.108 -r1.108.4.1 krb5/src/config/pre.in