pullup from trunk


To generate a diff of this commit:



	cvs diff -r1.8 -r1.8.4.1 krb5/src/windows/installer/nsis/ChangeLog
	cvs diff -r1.9 -r1.9.4.1
		krb5/src/windows/installer/nsis/kfw-fixed.nsi
	cvs diff -r1.4 -r1.4.4.1 krb5/src/windows/installer/wix/ChangeLog
	cvs diff -r1.3 -r1.3.4.1
		krb5/src/windows/installer/wix/features.wxi
		krb5/src/windows/installer/wix/files.wxi
	cvs diff -r1.1 -r1.1.6.1
		krb5/src/windows/installer/wix/lang/ChangeLog
		krb5/src/windows/installer/wix/lang/strings_1033.wxl