Merge branch 'va/p4-branch-import-test-update'

* va/p4-branch-import-test-update: git-p4: simple branch tests edits

Junio C Hamano committed Sep 2, 2011 at 13:18 UTC 80ade02e4600217f153e7ee8fdf193ace3f3d189

No changes.