Merged clutter-ivan branch into trunk.

svn merge \
 https://svn.o-hand.com/repos/clutter/trunk/clutter@2509 \
 https://svn.o-hand.com/repos/clutter/branches/clutter-ivan@HEAD

clutter/clutter-shader.c

@@ -49,7 +49,7 @@
 
 #include <glib.h>
 
-#include <cogl/cogl.h>
+#include "cogl/cogl.h"
 
 #include "clutter-debug.h"
 #include "clutter-private.h"
@@ -403,9 +403,6 @@ bind_glsl_shader (ClutterShader  *self,
   ClutterShaderPrivate *priv;
   priv = self->priv;
 
-  cogl_enable (CGL_FRAGMENT_SHADER);
-  cogl_enable (CGL_VERTEX_SHADER);
-
   priv->program = cogl_create_program ();
 
   if (priv->vertex_is_glsl && priv->vertex_source)