Code

Merge 'fixes' branch
authorJunio C Hamano <junkio@cox.net>
Sat, 24 Sep 2005 01:51:02 +0000 (18:51 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 24 Sep 2005 01:51:02 +0000 (18:51 -0700)
Signed-off-by: Junio C Hamano <junkio@cox.net>

Trivial merge