Merge proposals dependent on lp:~unity-team/compiz/trunk.fix_env

lp:~unity-team/compiz/trunk.fix_env has no merge proposals.