~bzr-pqm/bzr/bzr.dev

Merge the 2.1-simple-set branch

But revert the changes to bzrlib/_btree_serializer_pyx.pyx that didn't end up in that branch.
And restore the export and import headers.
Filename Latest Rev Last Changed Committer Comment Size
..