Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Fri, 23 Sep 2005 07:53:43 +0000 (00:53 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 23 Sep 2005 07:53:43 +0000 (00:53 -0700)
Trivial merge