pullup from trunk To generate a diff of this commit: cvs diff -r1.348.2.3 -r1.348.2.4 krb5/src/include/ChangeLog cvs diff -r1.18 -r1.18.2.1 krb5/src/include/port-sockets.h