Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 7 Jul 2011 09:13:19 +0000 (11:13 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 7 Jul 2011 09:13:19 +0000 (11:13 +0200)
commitb171259612d7ca2b29a7445be03d7702b51ab9c5
tree5edcf15eb6773a3909b8d42ba81dc24fd3497117
parent806cf03fbcbce0046331e2e349003e22238ee1a3
parent0993102834edd7172c7fc527646ae1f990786444
Merge branch 'master' into 0.11

Conflicts:
libs/gst/base/gstbasesrc.c
gst/gsttask.c
libs/gst/base/gstbasesrc.c