Merge with gitk.
authorJunio C Hamano <junkio@cox.net>
Fri, 5 Aug 2005 08:39:07 +0000 (01:39 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 5 Aug 2005 08:39:07 +0000 (01:39 -0700)

Trivial merge