pullup from trunk


To generate a diff of this commit:



	cvs diff -r1.68.2.12 -r1.68.2.13 krb5/doc/ChangeLog
	cvs diff -r1.21.2.4 -r1.21.2.5 krb5/doc/admin.texinfo