From: Martin Langhoff <martin@catalyst.net.nz>
Date: Wed, 3 May 2006 10:27:33 +0000 (+1200)
Subject: Merge with git://kernel.org/pub/scm/git/git.git
X-Git-Tag: v1.4.0-rc1~150^2^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=24e12579fc4d6886d5e62aeab53eefdaeaeaffcd;p=git.git

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

24e12579fc4d6886d5e62aeab53eefdaeaeaffcd