Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 21 Jul 2011 14:49:13 +0000 (16:49 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 21 Jul 2011 14:49:13 +0000 (16:49 +0200)
commit92aa4fede968470a0bfe5eddff931d209452cfec
treedabaa57d0615d8d16d7e6ffe60adf39529793a4a
parent2763f2bdcd0a3f5d7385aa161e8d0e9a98220a3c
parent70b95be8f0c65fd19f8cf7078f04a72014ba56a4
Merge branch 'master' into 0.11

Conflicts:
libs/gst/base/gstbaseparse.c
libs/gst/base/gstbasesink.c
gst/gstevent.c
gst/gstmessage.c
libs/gst/base/gstbaseparse.c
libs/gst/base/gstbasesink.c
tests/check/elements/filesrc.c