Merge with master.
commitdf6a6f0e87c44ff6daab7de3fde2237555ae95ac
authorJunio C Hamano <junkio@cox.net>
Wed, 10 Aug 2005 20:20:08 +0000 (10 13:20 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 10 Aug 2005 20:20:08 +0000 (10 13:20 -0700)
tree172f4cfa0a85fb1587a789b07d29552114c6a7f0
parentbdb71a41caa9ffed2e3207736c21fffbc2007670
parente8c80638abc99928dba9ac832589749a531e2e21
Merge with master.

This merges commit
    e8c80638abc99928dba9ac832589749a531e2e21
from master into our head commit
    bdb71a41caa9ffed2e3207736c21fffbc2007670

Sincerely,
    jit-merge command.