From: Junio C Hamano <junkio@cox.net>
Date: Fri, 24 Feb 2006 09:14:41 +0000 (-0800)
Subject: Merge fixes from master
X-Git-Tag: v1.3.0-rc1~54^2~38
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e6a933bdb7fd1f052a4b84fb4077f882cece40c6?hp=--cc

Merge fixes from master
---

e6a933bdb7fd1f052a4b84fb4077f882cece40c6