From: Junio C Hamano <junkio@cox.net>
Date: Thu, 18 Aug 2005 22:46:07 +0000 (-0700)
Subject: Merge with master.
X-Git-Tag: v0.99.5~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d430042bcf4d9da3e5f3cb9fee57c9d73bc40bff

Merge with master.
---

d430042bcf4d9da3e5f3cb9fee57c9d73bc40bff