pullup from trunk To generate a diff of this commit: cvs diff -r1.68.2.1 -r1.68.2.2 krb5/doc/ChangeLog cvs diff -r1.13 -r1.13.2.1 krb5/doc/definitions.texinfo