pullup from trunk


To generate a diff of this commit:



	cvs diff -r1.98 -r1.98.4.1 krb5/doc/ChangeLog
	cvs diff -r1.21 -r1.21.4.1 krb5/doc/build.texinfo