pullup from trunk


To generate a diff of this commit:



	cvs diff -r1.348.2.16 -r1.348.2.17 krb5/src/include/ChangeLog
	cvs diff -r1.135.2.10 -r1.135.2.11 krb5/src/include/k5-int.h
	cvs diff -r1.174.2.10 -r1.174.2.11 krb5/src/lib/krb4/ChangeLog
	cvs diff -r1.6.2.1 -r1.6.2.2 krb5/src/lib/krb4/RealmsConfig-glue.c
	cvs diff -r5.343.2.6 -r5.343.2.7 krb5/src/lib/krb5/os/ChangeLog
	cvs diff -r5.13.2.2 -r5.13.2.3 krb5/src/lib/krb5/os/accessor.c
	cvs diff -r5.74.2.1 -r5.74.2.2 krb5/src/lib/krb5/os/locate_kdc.c