Code

Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Sun, 23 Oct 2005 08:57:42 +0000 (01:57 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 23 Oct 2005 08:57:42 +0000 (01:57 -0700)

Trivial merge