Sync with maint

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

Junio C Hamano committed May 29, 2013 at 15:21 UTC 727a46b2f9a1ce69eaf09bc46cb129f1c40833d8

No changes.