Merge fixes up to GIT 1.1.1
authorJunio C Hamano <junkio@cox.net>
Wed, 11 Jan 2006 00:29:17 +0000 (16:29 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 11 Jan 2006 00:29:17 +0000 (16:29 -0800)

Trivial merge