Sync with maint

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

Junio C Hamano committed Jan 10, 2012 at 14:46 UTC e04dc492ac1206c7a7e624c09344081263af0e66

No changes.