Merge branch 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff
authorJunio C Hamano <junkio@cox.net>
Thu, 17 Nov 2005 10:00:25 +0000 (02:00 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 17 Nov 2005 10:00:25 +0000 (02:00 -0800)

Trivial merge