fixing commited conflict due to interrupted commit
fixing commited conflict due to interrupted commit

tardyp/clutter,jigpu/clutter,djdeath/clutter-multithreaded,djdeath/clutter-android,nobled/clutter,GNOME/clutter,kerrickstaley/clutter-vala,spatulasnout/clutter,ebassi/clutter,collects/clutter,rkudiyarov/clutter_osx,djdeath/clutter-android,djdeath/clutter,spatulasnout/clutter,jigpu/clutter,djdeath/clutter-android,heysion/clutter-clone,GNOME/clutter,ebassi/clutter,GNOME/clutter,spatulasnout/clutter,jigpu/clutter,Distrotech/clutter,collects/clutter,rkudiyarov/clutter_osx,djdeath/clutter,Distrotech/clutter,collects/clutter,Distrotech/clutter,nobled/clutter,ebassi/clutter,heysion/clutter-clone,djdeath/clutter,dlespiau/clutter,jigpu/clutter,dlespiau/clutter,spatulasnout/clutter,GNOME/clutter,Distrotech/clutter,rkudiyarov/clutter_osx,heysion/clutter-clone,Distrotech/clutter,kerrickstaley/clutter-vala,spatulasnout/clutter,djdeath/clutter-multithreaded,jigpu/clutter,ebassi/clutter,kerrickstaley/clutter-vala,djdeath/clutter-android,jigpu/clutter,djdeath/clutter,kerrickstaley/clutter-vala,ebassi/clutter,heysion/clutter-clone,rkudiyarov/clutter_osx,Distrotech/clutter,djdeath/clutter,tardyp/clutter,collects/clutter,GNOME/clutter,nobled/clutter,djdeath/clutter-multithreaded,collects/clutter,djdeath/clutter-multithreaded,djdeath/clutter-android,heysion/clutter-clone,dlespiau/clutter,tardyp/clutter,djdeath/clutter