Merge branch 'work/pt/for-junio' of git://repo.or.cz/git/mingw/4msysgit