Merge with master for gitk and doc updates.
authorJunio C Hamano <junkio@cox.net>
Thu, 18 Aug 2005 18:48:22 +0000 (11:48 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 18 Aug 2005 18:48:22 +0000 (11:48 -0700)

Trivial merge