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)
commit5f906b1c34a174fb6a5eb03f8063859d1a487721
tree1a4a356d3584265277a1d1db031406e43b13aa29
parentf8f135c9bae74f846a92e1f1f1fea8308802ace5
parentbabfaf8dee0baa09c56d1a2ec5623b60d900518b
Merge fixes up to 1.2.1