Fix fallout from SVN merge
Fix fallout from SVN merge

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