Code

Merge fixes up to GIT 1.0.5
authorJunio C Hamano <junkio@cox.net>
Tue, 27 Dec 2005 02:45:30 +0000 (18:45 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 27 Dec 2005 02:45:30 +0000 (18:45 -0800)

Trivial merge