pullup from trunk


To generate a diff of this commit:



	cvs diff -r1.4.4.1 -r1.4.4.2
		krb5/src/windows/installer/wix/ChangeLog
	cvs diff -r1.2 -r1.2.4.1 krb5/src/windows/installer/wix/config.wxi
	cvs diff -r1.3.4.1 -r1.3.4.2
		krb5/src/windows/installer/wix/features.wxi
	cvs diff -r1.2 -r1.2.4.1
		krb5/src/windows/installer/wix/site-local.wxi
	cvs diff -r1.1.6.1 -r1.1.6.2
		krb5/src/windows/installer/wix/lang/ChangeLog
		krb5/src/windows/installer/wix/lang/strings_1033.wxl