Merge with master.
commit16cc55ce1fba4885ab8fa7a11a520c0db14ef315
authorJunio C Hamano <junkio@cox.net>
Mon, 8 Aug 2005 00:10:50 +0000 (7 17:10 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 8 Aug 2005 00:10:50 +0000 (7 17:10 -0700)
treef1f59ac00ccce3835d0143e6609404a64ea64f0d
parent1ff53bfdeea4d707571c9cae818888c070b51153
parentd59a6043a8a7aed97c684fb4f14fe5221df1fcaf
Merge with master.

This merges commit
    d59a6043a8a7aed97c684fb4f14fe5221df1fcaf
from master into our head commit
    1ff53bfdeea4d707571c9cae818888c070b51153

Sincerely,
    jit-merge command.