Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 May 2012 18:50:20 +0000 (11:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 May 2012 18:50:20 +0000 (11:50 -0700)

Trivial merge