Merge fixes up to GIT 1.1.4
authorJunio C Hamano <junkio@cox.net>
Fri, 20 Jan 2006 03:57:56 +0000 (19:57 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 20 Jan 2006 03:57:56 +0000 (19:57 -0800)

Trivial merge