Merge with gitk.
authorJunio C Hamano <junkio@cox.net>
Wed, 10 Aug 2005 20:18:11 +0000 (13:18 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 10 Aug 2005 20:18:11 +0000 (13:18 -0700)
This merges commit
    466e4fdd6696c89700294e1a54fa73e1fb94643b
from gitk into our head commit
    ef0bd2e6e643f09a8294937caf99463328b9215a

Sincerely,
    jit-merge command.


Trivial merge