pullup from trunk


To generate a diff of this commit:



	cvs diff -r1.68 -r1.68.2.1 krb5/doc/ChangeLog
	cvs diff -r0 -r1.1.4.1 krb5/doc/krb4-xrealm.txt