pullup from trunk To generate a diff of this commit: cvs diff -r1.68.2.15 -r1.68.2.16 krb5/doc/ChangeLog cvs diff -r1.21.2.6 -r1.21.2.7 krb5/doc/admin.texinfo