pullup from trunk To generate a diff of this commit: cvs diff -r1.348.2.1 -r1.348.2.2 krb5/src/include/ChangeLog cvs diff -r1.34 -r1.34.2.1 krb5/src/include/fake-addrinfo.h