Merge with master to pick up gitk updates.
authorJunio C Hamano <junkio@cox.net>
Fri, 19 Aug 2005 23:24:29 +0000 (16:24 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 19 Aug 2005 23:24:29 +0000 (16:24 -0700)

Trivial merge