Merge proposals dependent on lp://staging/~smspillaz/compiz-core/compiz-core.fix_933226

lp://staging/~smspillaz/compiz-core/compiz-core.fix_933226 has no merge proposals.