From: Junio C Hamano <junkio@cox.net>
Date: Mon, 29 Aug 2005 00:57:45 +0000 (-0700)
Subject: Merge refs/heads/master from .
X-Git-Tag: v0.99.6^2~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=933693da77857b12ba86d999a601dbdb8ab212ff;p=git.git

Merge refs/heads/master from .
---

933693da77857b12ba86d999a601dbdb8ab212ff