pullup from trunk To generate a diff of this commit: cvs diff -r1.122.2.8 -r1.122.2.9 krb5/src/krb524/ChangeLog cvs diff -r1.28.2.3 -r1.28.2.4 krb5/src/krb524/cnv_tkt_skey.c cvs diff -r5.378.2.28 -r5.378.2.29 krb5/src/lib/krb5/krb/ChangeLog cvs diff -r5.2.2.1 -r5.2.2.2 krb5/src/lib/krb5/krb/conv_creds.c