Sync with 1.8.2.1

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

Junio C Hamano committed Apr 7, 2013 at 15:28 UTC 52a3e011c779456e63b6274af0024eeb92dd7888

No changes.