Merge branch 'master' into 0.11

Conflicts:
	libs/gst/base/gstbasetransform.c
This commit is contained in:
Wim Taymans 2011-10-28 16:27:43 +02:00
commit 5e8cf7fee7

Diff content is not available