Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 26 Aug 2011 09:09:07 +0000 (11:09 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 26 Aug 2011 09:09:07 +0000 (11:09 +0200)
commit31b70ea701fe72aa3c91caa307953b5a5619db50
treea72c47a04ee798cad5ca623f7d03fad2f9a63735
parent3d87984db3ad7f907b6c15e5891ac524a9c95313
parent63a21ca8b1efac8c05b4f7372ac7cdf21540dac3
Merge branch 'master' into 0.11

Conflicts:
libs/gst/base/gstbasetransform.c
libs/gst/base/gstbasetransform.h
libs/gst/base/gstbasetransform.c
libs/gst/base/gstbasetransform.h
plugins/elements/gstcapsfilter.c