pullup from trunk To generate a diff of this commit: cvs diff -r5.204 -r5.204.2.1 krb5/src/include/krb5/ChangeLog cvs diff -r5.76 -r5.76.2.1 krb5/src/include/krb5/kdb.h