pullup from trunk To generate a diff of this commit: cvs diff -r1.471.2.3 -r1.471.2.4 krb5/src/include/ChangeLog cvs diff -r1.173 -r1.173.4.1 krb5/src/include/krb5.hin