pullup from trunk To generate a diff of this commit: cvs diff -r1.1.2.6 -r1.1.2.7 krb5/src/windows/installer/nsis/kfw-fixed.nsi cvs diff -r1.1.2.2 -r1.1.2.3 krb5/src/windows/installer/nsis/utils.nsi