Merge proposals dependent on lp:~peter-maloney/bzr/peter

lp:~peter-maloney/bzr/peter has no merge proposals.