Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Sun, 25 Sep 2005 06:50:36 +0000 (23:50 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 25 Sep 2005 06:50:36 +0000 (23:50 -0700)

Trivial merge