Merge fixes up to GIT 1.0.6
authorJunio C Hamano <junkio@cox.net>
Wed, 28 Dec 2005 02:13:30 +0000 (18:13 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 28 Dec 2005 02:13:30 +0000 (18:13 -0800)

Trivial merge