Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 3 Nov 2011 10:30:52 +0000 (11:30 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 3 Nov 2011 10:30:52 +0000 (11:30 +0100)
commita1d82bec39304f246f6b5bd06c0c7951ca404373
treecdb5b583cc237fe33a3f66a87c0aeeb42c6edb1c
parente91b1ee41260ad6379e5772eed16b6f49b5c2399
parent391568efde9b737b9c7358110680e06cd62ae0fb
Merge branch 'master' into 0.11

Conflicts:
gst/gstghostpad.c
gst/gstghostpad.c
tests/check/gst/gstghostpad.c