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

[Wim Taymans]

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

Author: Wim Taymans <wim.taymans at collabora.co.uk>
Date:   Thu Feb 16 14:33:20 2012 +0100

Merge branch 'master' into 0.11

Conflicts:
	gst/mpegtsdemux/mpegtsbase.c
	gst/mpegtsdemux/mpegtspacketizer.c
	gst/mpegtsdemux/tsdemux.c
	gst/mve/gstmvedemux.c

---