Code

Merge with git://kernel.org/pub/scm/git/git.git
authorMartin Langhoff <martin@catalyst.net.nz>
Wed, 3 May 2006 10:27:33 +0000 (22:27 +1200)
committerMartin Langhoff <martin@catalyst.net.nz>
Wed, 3 May 2006 10:27:33 +0000 (22:27 +1200)

Trivial merge