Code review comment for lp://qastaging/~mehrdada/compiz/compiz.plugins-put

> If 'bzr merge lp:compiz' won't show a text conflict, all is good and you won't
> have to do anything for this to land...

It doesn't seem to have any conflicts. Merges cleanly.