pullup from trunk


To generate a diff of this commit:



	cvs diff -r1.348.2.24 -r1.348.2.25 krb5/src/include/ChangeLog
	cvs diff -r1.34.2.2 -r1.34.2.3 krb5/src/include/fake-addrinfo.h