Sync with 1.7.0.6
authorJunio C Hamano <redacted>
Fri, 23 Apr 2010 06:05:49 +0000 (23:05 -0700)
committerJunio C Hamano <redacted>
Fri, 23 Apr 2010 06:05:49 +0000 (23:05 -0700)
Signed-off-by: Junio C Hamano <redacted>

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