pullup from trunk To generate a diff of this commit: cvs diff -r1.218.2.2 -r1.218.2.3 krb5/src/lib/gssapi/krb5/ChangeLog cvs diff -r1.26 -r1.26.2.1 krb5/src/lib/gssapi/krb5/gssapi_krb5.h