[0.11] gst-plugins-bad: Merge branch 'master' into 0.11

[Wim Taymans]

Module: gst-plugins-bad
Branch: 0.11
Commit: a9f5def9d11c9a6623d7ed9d365160a4d8076b17
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=a9f5def9d11c9a6623d7ed9d365160a4d8076b17

Author: Wim Taymans <wim.taymans at collabora.co.uk>
Date:   Mon Feb 20 16:07:50 2012 +0100

Merge branch 'master' into 0.11

Conflicts:
	ext/opus/gstopusparse.c
	gst/colorspace/colorspace.c

---