Merge branch 'master' of git://people.freedesktop.org/~hausmann/git-p4