Code

Merge with master.
authorJunio C Hamano <junkio@cox.net>
Wed, 10 Aug 2005 20:20:08 +0000 (13:20 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 10 Aug 2005 20:20:08 +0000 (13:20 -0700)
This merges commit
    e8c80638abc99928dba9ac832589749a531e2e21
from master into our head commit
    bdb71a41caa9ffed2e3207736c21fffbc2007670

Sincerely,
    jit-merge command.


Trivial merge