pullup from trunk To generate a diff of this commit: cvs diff -r5.403.2.5 -r5.403.2.6 krb5/src/ChangeLog cvs diff -r1.253.2.5 -r1.253.2.6 krb5/src/aclocal.m4 cvs diff -r1.348.2.10 -r1.348.2.11 krb5/src/include/ChangeLog cvs diff -r1.154.2.3 -r1.154.2.4 krb5/src/include/krb5.hin