Code

Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Sat, 8 Oct 2005 00:08:56 +0000 (17:08 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 8 Oct 2005 00:08:56 +0000 (17:08 -0700)

Trivial merge