pullup from trunk To generate a diff of this commit: cvs diff -r1.471.2.1 -r1.471.2.2 krb5/src/include/ChangeLog cvs diff -r1.167 -r1.167.4.1 krb5/src/include/k5-int.h