Merge branch 'master' of git://winexe.git.sourceforge.net/gitroot/winexe/winexe-waf