Merge branch 'master' into 0.11

Conflicts:
	gst/colorspace/colorspace.c
This commit is contained in:
Wim Taymans 2012-02-21 10:06:16 +01:00
commit 710c519edd

Diff content is not available