Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Apr 2011 20:59:19 +0000 (13:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Apr 2011 20:59:19 +0000 (13:59 -0700)
* maint:


Trivial merge