pullup from trunk To generate a diff of this commit: cvs diff -r5.93 -r5.93.2.1 krb5/src/include/kerberosIV/ChangeLog cvs diff -r1.50 -r1.50.2.1 krb5/src/include/kerberosIV/krb.h