pullup from trunk To generate a diff of this commit: cvs diff -r1.348.2.17 -r1.348.2.18 krb5/src/include/ChangeLog cvs diff -r1.154.2.7 -r1.154.2.8 krb5/src/include/krb5.hin cvs diff -r1.122.2.6 -r1.122.2.7 krb5/src/krb524/ChangeLog cvs diff -r1.1.2.2 -r1.1.2.3 krb5/src/krb524/krb524.c