Merge proposals dependent on lp:~vila/bzr/2.5-integration

lp:~vila/bzr/2.5-integration has no merge proposals.