Merge branch 'fixes'
commit9f25c7bd5cf2bd6ae8e4775a4fd1a19f3eda10ea
authorJunio C Hamano <junkio@cox.net>
Wed, 21 Sep 2005 07:45:25 +0000 (21 00:45 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 21 Sep 2005 07:45:25 +0000 (21 00:45 -0700)
treebe958626d1c956961e714b209a5d2894f5a1be2f
parentdc4393cba333c92873671a37e72efaf41bfa4697
parentaf61c6e008c39ee9f61af33bb48850230f503443
Merge branch 'fixes'