Merge with master.
authorJunio C Hamano <junkio@cox.net>
Sun, 7 Aug 2005 03:54:43 +0000 (20:54 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 7 Aug 2005 03:54:43 +0000 (20:54 -0700)
This merges commit
bfe19f876cb20bea606e1a698030c017f31965c1
from master into our head commit
7a59013290bb26b80c997e5698757a735f1a92e0

Sincerely,
jit-merge command.

Trivial merge