Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2012 22:54:28 +0000 (15:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2012 22:54:28 +0000 (15:54 -0700)
* maint:

Trivial merge