Merge with master.
authorJunio C Hamano <junkio@cox.net>
Thu, 18 Aug 2005 22:46:07 +0000 (15:46 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 18 Aug 2005 22:46:07 +0000 (15:46 -0700)
commitd430042bcf4d9da3e5f3cb9fee57c9d73bc40bff
treee686ce80a9526f9cdadc71a068002f572618d840
parent920b9d9256372d3061584c270795868a4c29d1b4
parent66e06b6a17f1074401ad23f4b2a8a146b2900333
Merge with master.