Merge proposals dependent on lp:~mc-return/compiz/compiz.merge-fix1139835-grid-wrong-top-left-corner-calculation

1. compiz.merge-fix1139835-grid-wrong-top-left-corner-calculation
2. Dependent merge proposals