Merge branch 'master' into 0.11

Conflicts:
	common
	configure.ac
	gst/colorspace/colorspace.c
	gst/colorspace/colorspace.h
	gst/colorspace/gstcolorspace.c

diff --cc configure.ac
Simple merge

diff --cc ext/directfb/dfbvideosink.c
Simple merge

diff --cc gst/id3tag/id3tag.c
Simple merge

diff --cc gst/mxf/mxfdemux.c
Simple merge

diff --cc gst/sdi/gstsdidemux.c
index 1636b5a,7af936b..36b54f0
--- 1/gst/sdi/gstsdidemux.c
--- 2/gst/sdi/gstsdidemux.c
+++ b/gst/sdi/gstsdidemux.c
@@@ -366,8 -364,7 +364,6 @@@ gst_sdi_demux_chain (GstPad * pad, GstB
    if (sdidemux->output_buffer == NULL) {
      gst_sdi_demux_get_output_buffer (sdidemux);
    }
-   output_data = GST_BUFFER_DATA (sdidemux->output_buffer);
--
  #if 0
    if (sdidemux->offset) {
      int n;

diff --cc sys/Makefile.am
Simple merge