pullup from trunk To generate a diff of this commit: cvs diff -r1.68.2.11 -r1.68.2.12 krb5/doc/ChangeLog cvs diff -r1.15.2.2 -r1.15.2.3 krb5/doc/build.texinfo