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

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

Junio C Hamano committed Dec 13, 2011 at 22:04 UTC 2e8722fc9e34a53ae19f2b60b1d3038aa2af0ae6

No changes.