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