Code

Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Sun, 16 Oct 2005 19:21:38 +0000 (12:21 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 16 Oct 2005 19:21:38 +0000 (12:21 -0700)

Trivial merge