Merge with master for a couple more fixes.
authorJunio C Hamano <redacted>
Fri, 19 Aug 2005 20:55:59 +0000 (13:55 -0700)
committerJunio C Hamano <redacted>
Fri, 19 Aug 2005 20:55:59 +0000 (13:55 -0700)

Trivial merge
git clone https://git.99rst.org/PROJECT