pullup from trunk To generate a diff of this commit: cvs diff -r1.119.2.11 -r1.119.2.12 krb5/src/lib/ChangeLog cvs diff -r1.77.2.1 -r1.77.2.2 krb5/src/lib/Makefile.in cvs diff -r5.82.2.12 -r5.82.2.13 krb5/src/lib/krb5/ccache/ChangeLog cvs diff -r5.3.2.11 -r5.3.2.12 krb5/src/lib/krb5/ccache/cc_mslsa.c