Merge head 'cvs2git' of http://netz.smurf.noris.de/git/git
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 5 Jul 2005 19:03:14 +0000 (12:03 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 5 Jul 2005 19:03:14 +0000 (12:03 -0700)

Trivial merge