Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Fri, 23 Sep 2005 04:52:34 +0000 (21:52 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 23 Sep 2005 04:52:34 +0000 (21:52 -0700)

Trivial merge