Merge branch 'devel' of git://repo.or.cz/msysgit into devel