Merge proposals dependent on lp://staging/~townsend/compiz/fix-lp890747

lp://staging/~townsend/compiz/fix-lp890747 has no merge proposals.