Code

Sync with 1.7.9.3
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2012 22:29:50 +0000 (14:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2012 22:29:50 +0000 (14:29 -0800)

Trivial merge