pullup from trunk To generate a diff of this commit: cvs diff -r5.147.4.1 -r5.147.4.2 krb5/src/lib/krb5/ccache/ChangeLog cvs diff -r5.33.4.1 -r5.33.4.2 krb5/src/lib/krb5/ccache/cc_mslsa.c