Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 1 Mar 2012 13:43:01 +0000 (14:43 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 1 Mar 2012 13:43:01 +0000 (14:43 +0100)
commit99a8cd104864209ab24a480f4dcef9ce39b976ae
treed70ffc65fc8eaa78109af8d058e4ebd78bac81a6
parent70b5fc7ff0e2544ce6c6cdec65a8b6d6f91b55da
parent43a6f5a63d63a441394e4521da7ec4f484522276
Merge branch 'master' into 0.11

Conflicts:
libs/gst/base/gstcollectpads2.c
libs/gst/check/gstconsistencychecker.c
gst/gstquery.c
libs/gst/base/gstcollectpads2.c
libs/gst/check/gstconsistencychecker.c