Code

Merge fixes up to GIT 1.1.5
authorJunio C Hamano <junkio@cox.net>
Fri, 27 Jan 2006 22:50:10 +0000 (14:50 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 27 Jan 2006 22:50:10 +0000 (14:50 -0800)
Signed-off-by: Junio C Hamano <junkio@cox.net>

Trivial merge