Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Mon, 3 Oct 2005 23:32:57 +0000 (16:32 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 3 Oct 2005 23:32:57 +0000 (16:32 -0700)

Trivial merge