From: Martin Langhoff <martin@catalyst.net.nz>
Date: Sun, 7 May 2006 22:03:37 +0000 (+1200)
Subject: Merge with git://kernel.org/pub/scm/git/git.git
X-Git-Tag: v1.4.0-rc1~150^2^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=50c08d48722149d95f46bcc80a5211ea04b8a809;p=git.git

Merge with git://kernel.org/pub/scm/git/git.git
---

50c08d48722149d95f46bcc80a5211ea04b8a809