pullup from trunk To generate a diff of this commit: cvs diff -r1.174.2.6 -r1.174.2.7 krb5/src/lib/krb4/ChangeLog cvs diff -r1.17 -r1.17.2.1 krb5/src/lib/krb4/g_in_tkt.c