Sync with 1.7.5.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Jun 1, 2011 at 14:11 UTC a6605d76cdad37ed3c55a7be4d2e0af0f4721bb2

No changes.