pullup from trunk To generate a diff of this commit: cvs diff -r1.218.2.18 -r1.218.2.19 krb5/src/lib/gssapi/krb5/ChangeLog cvs diff -r1.50.2.5 -r1.50.2.6 krb5/src/lib/gssapi/krb5/gssapiP_krb5.h