Merge remote branch 'master' into texture-debugging

Conflicts:
	clutter/cogl/cogl/cogl-context.h

diff --cc clutter/cogl/cogl/cogl-context.h
index ce84b01,53c233c..dcbba2c
--- 1/clutter/cogl/cogl/cogl-context.h
--- 2/clutter/cogl/cogl/cogl-context.h
+++ b/clutter/cogl/cogl/cogl-context.h
@@@ -112,9 -111,12 +112,15 @@@ typedef struc
  
    CoglHandle        texture_download_material;
  
 +  CoglAtlas        *atlas;
 +  CoglHandle        atlas_texture;
 +
+   /* This debugging variable is used to pick a colour for visually
+      displaying the quad batches. It needs to be global so that it can
+      be reset by cogl_clear. It needs to be reset to increase the
+      chances of getting the same colour during an animation */
+   guint8            journal_rectangles_color;
+ 
    CoglContextDriver drv;
  } CoglContext;
  

diff --cc clutter/cogl/cogl/cogl-journal.c
Simple merge

diff --cc clutter/cogl/cogl/cogl-material.c
Simple merge

diff --cc clutter/cogl/cogl/cogl-types.h
Simple merge

diff --cc clutter/cogl/cogl/cogl-vertex-buffer.c
Simple merge