pullup from trunk To generate a diff of this commit: cvs diff -r1.348.2.29 -r1.348.2.30 krb5/src/include/ChangeLog cvs diff -r1.29.2.1 -r1.29.2.2 krb5/src/include/win-mac.h