Merge branch 'for-junio' of git://source.winehq.org/~julliard/git/git