Sync with 1.7.12.2

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

Junio C Hamano committed Sep 29, 2012 at 23:22 UTC 28de297ffeb0d6357118e384f8d943f4a41e75ac

No changes.