pullup from trunk


To generate a diff of this commit:



	cvs diff -r1.80 -r1.80.2.1 krb5/src/kadmin/cli/ChangeLog
	cvs diff -r1.57 -r1.57.2.1 krb5/src/kadmin/cli/kadmin.c
	cvs diff -r1.37 -r1.37.2.1 krb5/src/kadmin/ktutil/ChangeLog
	cvs diff -r1.12 -r1.12.2.1 krb5/src/kadmin/ktutil/ktutil.c
	cvs diff -r5.56.2.2 -r5.56.2.3 krb5/src/lib/krb5/keytab/ChangeLog
	cvs diff -r5.25 -r5.25.2.1 krb5/src/lib/krb5/keytab/ktbase.c
	cvs diff -r5.44 -r5.44.2.1 krb5/src/tests/create/ChangeLog
	cvs diff -r5.38 -r5.38.2.1 krb5/src/tests/create/kdb5_mkdums.c