Sync with 1.7.11.6

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

Junio C Hamano committed Sep 11, 2012 at 11:23 UTC 1c88a6d17492b197b9b3298cbc34efa804928302

No changes.