Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Sun, 25 Sep 2005 07:32:06 +0000 (00:32 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 25 Sep 2005 07:32:06 +0000 (00:32 -0700)
Trivial merge