Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 May 2012 22:37:28 +0000 (15:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 May 2012 22:37:28 +0000 (15:37 -0700)
* maint:


Trivial merge