Merge branch 'jc/maint-pack-object-cycle'

* jc/maint-pack-object-cycle: pack-object: tolerate broken packs that have duplicated objects Conflicts: builtin/pack-objects.c

Junio C Hamano committed Dec 5, 2011 at 15:19 UTC cddec4f8aea4809131dc1b1765d6c8e2a498a58e

No changes.