pullup from trunk To generate a diff of this commit: cvs diff -r5.180.2.4 -r5.180.2.5 krb5/src/config/ChangeLog cvs diff -r5.11 -r5.11.2.1 krb5/src/config/shlib.conf