pullup from trunk To generate a diff of this commit: cvs diff -r5.455.2.1 -r5.455.2.2 krb5/src/lib/krb5/krb/ChangeLog cvs diff -r5.24 -r5.24.10.1 krb5/src/lib/krb5/krb/copy_princ.c cvs diff -r5.12 -r5.12.10.1 krb5/src/lib/krb5/krb/cp_key_cnt.c