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)
commite6a933bdb7fd1f052a4b84fb4077f882cece40c6
tree7e35842e2dd571573649c433b73549ee2ccb1465
parent207a1f3ce9894ad6fab59077b9cec1adc70ed6c5
parent3efaa937a52aff14ca35207fd3a8a4d1d1ed2067
Merge fixes from master