Merge fixes from master
authorJunio C Hamano <junkio@cox.net>
Fri, 24 Feb 2006 09:14:41 +0000 (01:14 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 24 Feb 2006 09:14:41 +0000 (01:14 -0800)

Trivial merge