pullup from trunk


To generate a diff of this commit:



	cvs diff -r1.27 -r1.27.2.1 krb5/src/windows/cns/ChangeLog
	cvs diff -r1.23 -r1.23.2.1 krb5/src/windows/cns/cns.c
	cvs diff -r1.9 -r1.9.2.1 krb5/src/windows/cns/cns.h
	cvs diff -r1.3 -r1.3.4.1 krb5/src/windows/cns/cns_reg.c
	cvs diff -r1.1 -r1.1.14.1 krb5/src/windows/cns/cns_reg.h
	cvs diff -r1.4 -r1.4.12.1 krb5/src/windows/cns/cnsres5.rc
	cvs diff -r1.3 -r1.3.12.1 krb5/src/windows/cns/options.c