Code

Sync with 1.7.9.4
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Mar 2012 22:54:21 +0000 (15:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Mar 2012 22:54:21 +0000 (15:54 -0700)

Trivial merge