From: Junio C Hamano <junkio@cox.net>
Date: Sun, 5 Mar 2006 00:21:33 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.3.0-rc1~50
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3ab8532b07f37e9f16df8aaaadd175646b7bea26;p=git.git

Merge branch 'master' into next

* master:
  Cauterize dropped or duplicate bits from next.
  Merge part of 'sp/checkout'
---

3ab8532b07f37e9f16df8aaaadd175646b7bea26