pullup from trunk To generate a diff of this commit: cvs diff -r5.82.2.14 -r5.82.2.15 krb5/src/lib/krb5/ccache/ChangeLog cvs diff -r5.20.2.2 -r5.20.2.3 krb5/src/lib/krb5/ccache/ccbase.c cvs diff -r5.56.2.4 -r5.56.2.5 krb5/src/lib/krb5/keytab/ChangeLog cvs diff -r5.25.2.2 -r5.25.2.3 krb5/src/lib/krb5/keytab/ktbase.c