Code

Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Tue, 4 Oct 2005 02:13:04 +0000 (19:13 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 4 Oct 2005 02:13:04 +0000 (19:13 -0700)

Trivial merge