Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Jun 2007 05:05:30 +0000 (22:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Jun 2007 05:05:30 +0000 (22:05 -0700)
* maint:

Trivial merge