Merge branch 'for-junio' of git://repo.or.cz/git/mingw/j6t