Merge branch 'master' into 0.11

Conflicts:
	gst/gstvalue.c

diff --cc gst/gstcaps.c
Simple merge

diff --cc gst/gststructure.c
Simple merge

diff --cc gst/gstvalue.c
index ef25718,0e02039..b2e0b80
--- 1/gst/gstvalue.c
--- 2/gst/gstvalue.c
+++ b/gst/gstvalue.c
@@@ -3488,8 -3688,8 +3560,8 @@@ gst_value_can_intersect (const GValue 
  
  /**
   * gst_value_intersect:
 - * @dest: (out caller-allocates): a uninitialized #GValue that will hold the calculated
 + * @dest: (out caller-allocates) (transfer full): a uninitialized #GValue that will hold the calculated
-  * intersection value
+  * intersection value. May be NULL if the resulting set if not needed.
   * @value1: a value to intersect
   * @value2: another value to intersect
   *
@@@ -3542,8 -3742,10 +3614,10 @@@ gst_value_intersect (GValue * dest, con
    return FALSE;
  }
  
+ 
+ 
  /**
 - * gst_value_register_intersect_func:
 + * gst_value_register_intersect_func: (skip)
   * @type1: the first type to intersect
   * @type2: the second type to intersect
   * @func: the intersection function