Merge branch 'fix'
authorJunio C Hamano <junkio@cox.net>
Mon, 16 Jan 2006 05:34:31 +0000 (21:34 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 16 Jan 2006 05:34:31 +0000 (21:34 -0800)

Trivial merge