Merge proposals dependent on lp://staging/~beuno/bzr-upload/bug-499525

lp://staging/~beuno/bzr-upload/bug-499525 has no merge proposals.