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