From: Junio C Hamano <junkio@cox.net>
Date: Fri, 2 Jun 2006 22:24:26 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.4.1-rc1~42
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1da07343ae553af07eac09cc741ca91b6615023c;p=git.git

Merge branch 'master' into next

* master:
  sha1_file: avoid re-preparing duplicate packs
  handle concurrent pruning of packed objects
---

1da07343ae553af07eac09cc741ca91b6615023c