Updated openstack/openstack
Project: openstack/swift  eaab4d3fd6b7a330c1b904dc69d7ea4f0fbe8781

container.merge_items bug

When replicated container entries get round-tripped through json, they wind up
with unicode objects for names.  This causes equality checks to fail against
container entries, and you can wind up with duplicate records.  My bad.

Change-Id: I3aee2ad8dbd3a617efe37e887cfb902a3e4a1646