From: Junio C Hamano <junkio@cox.net>
Date: Wed, 6 Dec 2006 18:48:08 +0000 (-0800)
Subject: Merge
X-Git-Tag: v1.5.0-rc0~160
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c0b7391bf5dd314523b8c6ea29ffafc8769f2eb1;p=git.git

Merge
---

c0b7391bf5dd314523b8c6ea29ffafc8769f2eb1