Sync with maint

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

Junio C Hamano committed Oct 15, 2011 at 20:56 UTC 288396994f077eec7e7db0017838a5afbfbf81e3

No changes.