pullup from trunk To generate a diff of this commit: cvs diff -r1.471.2.6 -r1.471.2.7 krb5/src/include/ChangeLog cvs diff -r1.22.2.1 -r1.22.2.2 krb5/src/include/k5-thread.h