Merge with master.
authorJunio C Hamano <junkio@cox.net>
Tue, 9 Aug 2005 01:02:39 +0000 (18:02 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 9 Aug 2005 01:02:39 +0000 (18:02 -0700)
commite764a10b17610ed9b3969bdb351e09f9635eb0ab
tree7bfb70afc16be8332f0ad177ec2d0cc878047b6e
parent80f45687f44b6258b0eacae6b1ae15e3ad4a6552
parent3c4e8a636f4de3668b24d0020df731cdc78ae6e9
Merge with master.

This merges commit
    3c4e8a636f4de3668b24d0020df731cdc78ae6e9
from master into our head commit
    80f45687f44b6258b0eacae6b1ae15e3ad4a6552

Sincerely,
    jit-merge command.
Makefile