Merge proposals dependent on lp:~james-w/bzr-builder/trunk-old

lp:~james-w/bzr-builder/trunk-old has no merge proposals.