pullup from trunk To generate a diff of this commit: cvs diff -r5.479.4.6 -r5.479.4.7 krb5/src/ChangeLog cvs diff -r1.308.4.2 -r1.308.4.3 krb5/src/aclocal.m4