Merge branch 'master' into 0.11

Conflicts:
	gst/adder/gstadder.c
This commit is contained in:
Sebastian Dröge 2012-01-27 15:12:25 +01:00
commit bf66a410c1

Diff content is not available