pullup from trunk To generate a diff of this commit: cvs diff -r5.147.4.3 -r5.147.4.4 krb5/src/lib/krb5/ccache/ChangeLog cvs diff -r5.41 -r5.41.4.1 krb5/src/lib/krb5/ccache/cc_file.c