Merge commit 'nothingmuch/p4_git_utils' into blead
Rafael Garcia-Suarez [Mon, 12 Jan 2009 08:29:28 +0000 (09:29 +0100)]

Trivial merge