Merge proposals dependent on lp:~vila/bzr/fixing-tarmac

lp:~vila/bzr/fixing-tarmac has no merge proposals.