Merge proposals dependent on lp://staging/~veger/bzr-builddeb/fix-for-934096

lp://staging/~veger/bzr-builddeb/fix-for-934096 has no merge proposals.