Merge with gitk.
authorJunio C Hamano <junkio@cox.net>
Tue, 9 Aug 2005 17:21:09 +0000 (10:21 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 9 Aug 2005 17:21:09 +0000 (10:21 -0700)
This merges commit
b1ba39e7e80cdee3e7c1c80334cd9aa87b9b7b69
from gitk into our head commit
93b5fcdd8ddaa7f55ce1a43d8b9eaed1d5febc98

Sincerely,
jit-merge command.

Trivial merge