pullup from trunk To generate a diff of this commit: cvs diff -r5.82.2.4 -r5.82.2.5 krb5/src/lib/krb5/ccache/ChangeLog cvs diff -r5.26 -r5.26.2.1 krb5/src/lib/krb5/ccache/cc_file.c cvs diff -r5.11 -r5.11.2.1 krb5/src/lib/krb5/ccache/cc_memory.c cvs diff -r5.3.2.2 -r5.3.2.3 krb5/src/lib/krb5/ccache/cc_mslsa.c cvs diff -r5.91.2.4 -r5.91.2.5 krb5/src/lib/krb5/error_tables/ChangeLog cvs diff -r5.72.2.2 -r5.72.2.3 krb5/src/lib/krb5/error_tables/krb5_err.et