pullup from trunk To generate a diff of this commit: cvs diff -r1.2.2.3 -r1.2.2.4 krb5/src/windows/installer/wix/ChangeLog cvs diff -r1.1.2.2 -r1.1.2.3 krb5/src/windows/installer/wix/files.wxi cvs diff -r1.1.2.1 -r1.1.2.2 krb5/src/windows/installer/wix/msi-deployment-guide.txt