Merge branch 'master' into 0.11

Conflicts:
	gst/gstpad.c
This commit is contained in:
Sebastian Dröge 2011-09-08 14:30:07 +02:00
commit 97560eb9cb

Diff content is not available