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

Wed Jan 25 04:24:03 PST 2012

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

Author: Sebastian DrÃ¶ge <sebastian.droege at collabora.co.uk>
Date:   Wed Jan 25 13:22:43 2012 +0100

Merge branch 'master' into 0.11

Conflicts:
	configure.ac
	ext/kate/gstkateenc.c
	gst/colorspace/colorspace.c
	gst/mpegvideoparse/mpegvideoparse.c

---