Merge with gitk
authorJunio C Hamano <junkio@cox.net>
Thu, 18 Aug 2005 04:09:15 +0000 (21:09 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 18 Aug 2005 04:09:15 +0000 (21:09 -0700)

Trivial merge