Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Tue, 4 Oct 2005 04:57:35 +0000 (21:57 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 4 Oct 2005 04:57:35 +0000 (21:57 -0700)

Trivial merge