Code

Merge with gitk --parents change.
authorJunio C Hamano <junkio@cox.net>
Thu, 18 Aug 2005 19:18:27 +0000 (12:18 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 18 Aug 2005 19:18:27 +0000 (12:18 -0700)

Trivial merge