Sync with 1.7.8.2

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

Junio C Hamano committed Dec 28, 2011 at 12:04 UTC 48de6569eb1c4b0ab62e63b20c693fe3017171f2

No changes.