[mingw32-nsis/f12/master: 5/6] Merge branch 'f12/master' of ssh://pkgs.fedoraproject.org/mingw32-nsis into f12/master

[Kevin Kofler]

commit e46c91de72ca1ed30e6494b4a6ae66b13e295949
Merge: 78c144c 4e81ddc
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Wed Aug 11 14:35:34 2010 +0200

    Merge branch 'f12/master' of ssh://pkgs.fedoraproject.org/mingw32-nsis into f12/master

---