Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 28 Oct 2011 09:46:40 +0000 (11:46 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 28 Oct 2011 09:46:40 +0000 (11:46 +0200)
commit05c025de6d7f721720264c1e1e5f20909a09038e
treed58be4666762c0736cee07c8f9f87711a355d829
parent9b94fc3102ee38fd344d6b03e9fa3b03680e537a
parentc603bf98910fcf1ec4575b04373a22c2b0898eea
Merge branch 'master' into 0.11

Conflicts:
gst/videomixer/gstcollectpads2.c