pullup from trunk To generate a diff of this commit: cvs diff -r1.68.2.4 -r1.68.2.5 krb5/doc/ChangeLog cvs diff -r1.21 -r1.21.2.1 krb5/doc/admin.texinfo cvs diff -r1.7 -r1.7.2.1 krb5/doc/krb425.texinfo