Sync with 1.7.11.4

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

Junio C Hamano committed Jul 30, 2012 at 13:17 UTC 9c9b9ede9062ad702a6aa4384a597beb473e0293

No changes.