Code

Merge rsync://rsync.kernel.org/pub/scm/gitk/gitk
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 28 Jun 2005 01:15:47 +0000 (18:15 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 28 Jun 2005 01:15:47 +0000 (18:15 -0700)

Trivial merge