pullup from trunk To generate a diff of this commit: cvs diff -r1.29 -r1.29.4.1 krb5/src/windows/cns/ChangeLog cvs diff -r1.8 -r1.8.12.1 krb5/src/windows/cns/tktlist.c