pullup from trunk To generate a diff of this commit: cvs diff -r1.348.2.31 -r1.348.2.32 krb5/src/include/ChangeLog cvs diff -r1.34.2.4 -r1.34.2.5 krb5/src/include/fake-addrinfo.h