Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 May 2012 17:45:47 +0000 (10:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 May 2012 17:45:47 +0000 (10:45 -0700)

Trivial merge