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)
commita68de9592e4565a2cf3e14b3bc9c9cd57d7306d5
treea43c27e8497be9aa9bc27eef46150158cdf369bb
parent3efaa937a52aff14ca35207fd3a8a4d1d1ed2067
parent6d5129ac098e8b9c270efd5fa2695163122a0a46
Merge fixes early for next maint series.