pullup from trunk


To generate a diff of this commit:



	cvs diff -r5.479.4.1 -r5.479.4.2 krb5/src/ChangeLog
	cvs diff -r1.308 -r1.308.4.1 krb5/src/aclocal.m4