Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Tue, 18 Oct 2005 00:39:11 +0000 (17:39 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 18 Oct 2005 00:39:11 +0000 (17:39 -0700)

Trivial merge