Sync with maint

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

Junio C Hamano committed Sep 11, 2012 at 11:31 UTC 04f426246651cb2c75253939cc065c1069744513

No changes.