pullup from trunk


To generate a diff of this commit:



	cvs diff -r5.479.4.2 -r5.479.4.3 krb5/src/ChangeLog
	cvs diff -r1.147.4.1 -r1.147.4.2 krb5/src/Makefile.in
	cvs diff -r5.25 -r5.25.4.1 krb5/src/clients/ChangeLog
	cvs diff -r1.21 -r1.21.4.1 krb5/src/clients/Makefile.in
	cvs diff -r1.1 -r1.1.4.1 krb5/src/clients/kdeltkt/ChangeLog
		krb5/src/clients/kdeltkt/Makefile.in