From: Junio C Hamano <junkio@cox.net>
Date: Fri, 19 Aug 2005 20:55:59 +0000 (-0700)
Subject: Merge with master for a couple more fixes.
X-Git-Tag: v0.99.5~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0026d5484158ee093da5ab302ee794ec1931303f;p=git.git

Merge with master for a couple more fixes.
---

0026d5484158ee093da5ab302ee794ec1931303f