Merge branch 'git-p4' of git://repo.or.cz/git/git-p4