Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 19 May 2011 09:30:06 +0000 (11:30 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 19 May 2011 09:30:06 +0000 (11:30 +0200)
commit4a646e0e76cd578a70a06031e1a8fd54ae04796d
tree5d16487468df874c9ea93110855a270ca16ba8d2
parentbe01ecf530c3825b63653a431c30aaead673cfd2
parentb592d038d3e3068c0e8678281bf5b20996fd7c27
Merge branch 'master' into 0.11

Conflicts:
gst/gstghostpad.h
docs/gst/gstreamer-sections.txt
gst/gstghostpad.h
gst/gstminiobject.c