From: Junio C Hamano <junkio@cox.net>
Date: Sun, 14 Aug 2005 01:38:52 +0000 (-0700)
Subject: Merge master into rc
X-Git-Tag: v0.99.5~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f4cedd483e5bc4b9553dbc40e084548f7f3bf2ab;p=git.git

Merge master into rc
---

f4cedd483e5bc4b9553dbc40e084548f7f3bf2ab