Merge proposals

Bzr-builddeb-hackers has no merge proposals.