pullup from trunk To generate a diff of this commit: cvs diff -r1.20.2.12 -r1.20.2.13 krb5/README cvs diff -r1.68.2.10 -r1.68.2.11 krb5/doc/ChangeLog cvs diff -r1.15.2.1 -r1.15.2.2 krb5/doc/build.texinfo