Code

Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Wed, 5 Oct 2005 00:04:26 +0000 (17:04 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 5 Oct 2005 00:04:26 +0000 (17:04 -0700)

Trivial merge