pullup from trunk To generate a diff of this commit: cvs diff -r1.122.2.7 -r1.122.2.8 krb5/src/krb524/ChangeLog cvs diff -r1.28.2.2 -r1.28.2.3 krb5/src/krb524/cnv_tkt_skey.c