Merge branch 'master' into 0.11

Conflicts:
	configure.ac
	ext/kate/gstkateenc.c
	gst/colorspace/colorspace.c
	gst/mpegvideoparse/mpegvideoparse.c
This commit is contained in:
Sebastian Dröge 2012-01-25 13:22:43 +01:00
commit 2f63804633

Diff content is not available