Merge with gitk.
authorJunio C Hamano <junkio@cox.net>
Sun, 31 Jul 2005 17:32:49 +0000 (10:32 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 31 Jul 2005 17:32:49 +0000 (10:32 -0700)

Trivial merge