Merge from gitk
authorJunio C Hamano <junkio@cox.net>
Fri, 19 Aug 2005 23:15:59 +0000 (16:15 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 19 Aug 2005 23:15:59 +0000 (16:15 -0700)
Trivial merge