Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Thu, 22 Dec 2005 07:48:31 +0000 (23:48 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 22 Dec 2005 07:48:31 +0000 (23:48 -0800)

Trivial merge