pullup from trunk To generate a diff of this commit: cvs diff -r1.68.2.13 -r1.68.2.14 krb5/doc/ChangeLog cvs diff -r1.21.2.5 -r1.21.2.6 krb5/doc/admin.texinfo