Merge of http://members.cox.net/junkio/git-jc.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 6 May 2005 01:30:18 +0000 (18:30 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 6 May 2005 01:30:18 +0000 (18:30 -0700)

Trivial merge