Merge with gitk.
authorJunio C Hamano <junkio@cox.net>
Fri, 12 Aug 2005 01:24:35 +0000 (18:24 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 12 Aug 2005 01:24:35 +0000 (18:24 -0700)
This merges commit
    b664550c066810b770ad3e19cafe2fbdd42c6793
from gitk into our head commit
    bf570303153902ec3d85570ed24515bcf8948848

Sincerely,
    jit-merge command.


Trivial merge