Merge with master.
commitc3958a7926ab20b90fe0767580b466698477f5b6
authorJunio C Hamano <junkio@cox.net>
Tue, 9 Aug 2005 05:57:57 +0000 (8 22:57 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 9 Aug 2005 05:57:57 +0000 (8 22:57 -0700)
tree80bf9ad53c61e817ad7269bb0f8f8e0a8ae8f1d9
parente764a10b17610ed9b3969bdb351e09f9635eb0ab
parentc882bc932f6702a935c748893536356b0bba11ce
Merge with master.

This merges commit
    c882bc932f6702a935c748893536356b0bba11ce
from master into our head commit
    e764a10b17610ed9b3969bdb351e09f9635eb0ab

Sincerely,
    jit-merge command.