Merge fixes up to 1.2.1
authorJunio C Hamano <junkio@cox.net>
Thu, 16 Feb 2006 03:39:21 +0000 (19:39 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 16 Feb 2006 03:39:21 +0000 (19:39 -0800)
Trivial merge