Sync with 1.7.4.4
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2011 17:51:30 +0000 (10:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2011 17:51:30 +0000 (10:51 -0700)

Trivial merge