Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 20 May 2011 14:03:10 +0000 (16:03 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 20 May 2011 14:03:10 +0000 (16:03 +0200)
commita0fded5c375344b8a1e1d445aa24c5f9607a2cd8
tree79ce75158bb1834a43a3996fe5b27b770e679c92
parentd33909302e04463e30d0bbe398678bf001e28339
parentd0e95889c0601942ce03c605f37d9fce48b1ed84
Merge branch 'master' into 0.11

Conflicts:
gst/gstpad.h
gst/gstplugin.h