pullup from trunk To generate a diff of this commit: cvs diff -r1.348.2.22 -r1.348.2.23 krb5/src/include/ChangeLog cvs diff -r1.154.2.10 -r1.154.2.11 krb5/src/include/krb5.hin