pullup from trunk To generate a diff of this commit: cvs diff -r5.229.4.2 -r5.229.4.3 krb5/src/config/ChangeLog cvs diff -r5.34 -r5.34.4.1 krb5/src/config/shlib.conf