pullup from trunk To generate a diff of this commit: cvs diff -r5.180.2.2 -r5.180.2.3 krb5/src/config/ChangeLog cvs diff -r5.13 -r5.13.2.1 krb5/src/config/win-pre.in