Merge fixes early for next maint series.
authorJunio C Hamano <junkio@cox.net>
Fri, 24 Feb 2006 10:21:28 +0000 (02:21 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 24 Feb 2006 10:21:28 +0000 (02:21 -0800)

Trivial merge