pullup from trunk To generate a diff of this commit: cvs diff -r1.218.2.5 -r1.218.2.6 krb5/src/lib/gssapi/krb5/ChangeLog cvs diff -r1.31 -r1.31.2.1 krb5/src/lib/gssapi/krb5/acquire_cred.c