From: Martin Langhoff <martin@catalyst.net.nz>
Date: Sun, 30 Apr 2006 22:20:56 +0000 (+1200)
Subject: Merge with git://kernel.org/pub/scm/git/git.git
X-Git-Tag: v1.4.0-rc1~150^2^2~6
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=e660e3997fbad830e5723336d61883f3a50dbc92

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

e660e3997fbad830e5723336d61883f3a50dbc92