pullup from trunk To generate a diff of this commit: cvs diff -r5.403.2.1 -r5.403.2.2 krb5/src/ChangeLog cvs diff -r1.253.2.1 -r1.253.2.2 krb5/src/aclocal.m4