Merge with git://kernel.org/pub/scm/git/git.git
authorMartin Langhoff <martin@catalyst.net.nz>
Sun, 30 Apr 2006 22:20:56 +0000 (10:20 +1200)
committerMartin Langhoff <martin@catalyst.net.nz>
Sun, 30 Apr 2006 22:20:56 +0000 (10:20 +1200)

Trivial merge