pullup from trunk To generate a diff of this commit: cvs diff -r1.275.4.3 -r1.275.4.4 krb5/src/lib/gssapi/krb5/ChangeLog cvs diff -r1.19.4.1 -r1.19.4.2 krb5/src/lib/gssapi/krb5/import_name.c