Merge with gitk.
authorJunio C Hamano <junkio@cox.net>
Sun, 7 Aug 2005 21:11:08 +0000 (14:11 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 7 Aug 2005 21:11:08 +0000 (14:11 -0700)
This merges commit
    d6e8149bc53de57cab7cc0d9aff6c2341f3a7efa
from gitk into our head commit
    200e7fbbac82b6665f8175af0e375fbef3568c30

Sincerely,
    jit-merge command.


Trivial merge