Merge proposals dependent on lp://staging/~secroft/obsetup/trunk

lp://staging/~secroft/obsetup/trunk has no merge proposals.