Sync with 1.7.1.1
authorJunio C Hamano <redacted>
Tue, 29 Jun 2010 18:24:36 +0000 (11:24 -0700)
committerJunio C Hamano <redacted>
Tue, 29 Jun 2010 18:24:36 +0000 (11:24 -0700)
Signed-off-by: Junio C Hamano <redacted>

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