Sync with 'maint'

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

Junio C Hamano committed Feb 25, 2013 at 08:27 UTC 2a4a26b53d5ad18ded5d79b0cf0b617ebbb758b4

No changes.