Merge fixes from master
authorJunio C Hamano <redacted>
Fri, 24 Feb 2006 09:14:41 +0000 (01:14 -0800)
committerJunio C Hamano <redacted>
Fri, 24 Feb 2006 09:14:41 +0000 (01:14 -0800)

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