[0.11] gstreamer: Merge branch 'master' into 0.11

Thu Mar 1 05:51:44 PST 2012

Module: gstreamer
Branch: 0.11
Commit: 99a8cd104864209ab24a480f4dcef9ce39b976ae
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=99a8cd104864209ab24a480f4dcef9ce39b976ae

Author: Sebastian DrÃ¶ge <sebastian.droege at collabora.co.uk>
Date:   Thu Mar  1 14:43:01 2012 +0100

Merge branch 'master' into 0.11

Conflicts:
	libs/gst/base/gstcollectpads2.c
	libs/gst/check/gstconsistencychecker.c

---