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