Merge with master.
commit1ff53bfdeea4d707571c9cae818888c070b51153
authorJunio C Hamano <junkio@cox.net>
Sun, 7 Aug 2005 21:12:38 +0000 (7 14:12 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 7 Aug 2005 21:12:38 +0000 (7 14:12 -0700)
tree3e38d18030effd892e76ab001b62be29866fd488
parentf29eaed12fc07bc5b2e4d1a302136a26ff4488ce
parent6b7242aa1acc3c7835f80522914ffc4b2e789a29
Merge with master.

This merges commit
    6b7242aa1acc3c7835f80522914ffc4b2e789a29
from master into our head commit
    f29eaed12fc07bc5b2e4d1a302136a26ff4488ce

Sincerely,
    jit-merge command.