Merge from master for misc fixes.
authorJunio C Hamano <junkio@cox.net>
Wed, 17 Aug 2005 22:38:47 +0000 (15:38 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 17 Aug 2005 22:38:47 +0000 (15:38 -0700)

Trivial merge