Merge with git://kernel.org/pub/scm/git/git.git
authorMartin Langhoff <martin@catalyst.net.nz>
Sun, 7 May 2006 22:03:37 +0000 (10:03 +1200)
committerMartin Langhoff <martin@catalyst.net.nz>
Sun, 7 May 2006 22:03:37 +0000 (10:03 +1200)

Trivial merge