Merge maint in
authorJunio C Hamano <gitster@pobox.com>
Wed, 2 Jul 2008 00:19:34 +0000 (17:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Jul 2008 00:19:34 +0000 (17:19 -0700)

Trivial merge