pullup from trunk To generate a diff of this commit: cvs diff -r1.348.2.6 -r1.348.2.7 krb5/src/include/ChangeLog cvs diff -r1.135.2.2 -r1.135.2.3 krb5/src/include/k5-int.h cvs diff -r5.378.2.6 -r5.378.2.7 krb5/src/lib/krb5/krb/ChangeLog cvs diff -r5.21 -r5.21.2.1 krb5/src/lib/krb5/krb/copy_data.c cvs diff -r5.101.2.1 -r5.101.2.2 krb5/src/lib/krb5/krb/get_in_tkt.c cvs diff -r5.23.2.1 -r5.23.2.2 krb5/src/lib/krb5/krb/preauth2.c