From: Junio C Hamano <junkio@cox.net>
Date: Wed, 21 Dec 2005 22:00:47 +0000 (-0800)
Subject: Merge branch 'fixes'
X-Git-Tag: v1.1.0~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2a212746f44f18695d33931039da10f842de7b25;p=git.git

Merge branch 'fixes'
---

2a212746f44f18695d33931039da10f842de7b25