Merge branch 'maint'
commitc43f64a0afd7b4bd87ec83449995fad21b741af6
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Jun 2007 04:05:09 +0000 (12 21:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Jun 2007 04:05:09 +0000 (12 21:05 -0700)
treeb0e126719109d116c2d5c48489984cdd4681aca4
parent9bfe9f80b1f57dd5bd63c94516fb8aa820fef1cd
parent4f01d0f92db5cb38aaaab83adb50557beb35fb91
Merge branch 'maint'

* maint: