Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 19:07:14 +0000 (12:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 19:07:14 +0000 (12:07 -0700)

Trivial merge