pullup from trunk To generate a diff of this commit: cvs diff -r1.218.2.12 -r1.218.2.13 krb5/src/lib/gssapi/krb5/ChangeLog cvs diff -r1.77.2.5 -r1.77.2.6 krb5/src/lib/gssapi/krb5/accept_sec_context.c cvs diff -r1.66.2.7 -r1.66.2.8 krb5/src/lib/gssapi/krb5/init_sec_context.c