Merge master.kernel.org:/pub/scm/gitk/gitk
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 6 Jul 2005 02:00:26 +0000 (19:00 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 6 Jul 2005 02:00:26 +0000 (19:00 -0700)

Trivial merge