Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Wed, 21 Dec 2005 22:00:47 +0000 (14:00 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 21 Dec 2005 22:00:47 +0000 (14:00 -0800)

Trivial merge