pullup from trunk To generate a diff of this commit: cvs diff -r5.229.4.3 -r5.229.4.4 krb5/src/config/ChangeLog cvs diff -r5.17.4.1 -r5.17.4.2 krb5/src/config/win-pre.in