Sync with maint

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

Junio C Hamano committed Feb 13, 2012 at 11:47 UTC 6f5e880c68099b185e60b2492c75e506e16d8292

No changes.