pullup from trunk To generate a diff of this commit: cvs diff -r1.137.4.1 -r1.137.4.2 krb5/src/lib/ChangeLog cvs diff -r1.40 -r1.40.6.1 krb5/src/lib/krb5_32.def