From: Junio C Hamano <junkio@cox.net>
Date: Mon, 16 Jan 2006 05:34:31 +0000 (-0800)
Subject: Merge branch 'fix'
X-Git-Tag: v1.2.0~140
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0620db36f85788193de2102884ff8dd94222660f;p=git.git

Merge branch 'fix'
---

0620db36f85788193de2102884ff8dd94222660f