pullup from trunk To generate a diff of this commit: cvs diff -r1.122.2.4 -r1.122.2.5 krb5/src/krb524/ChangeLog cvs diff -r1.20.4.1 -r1.20.4.2 krb5/src/krb524/k524init.c