Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 20 May 2011 10:07:45 +0000 (12:07 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 20 May 2011 10:07:45 +0000 (12:07 +0200)
commita9edf7c6aad8a25ce5eeac832a22e67a888f85e0
tree1bf82791084af0187c5eb6713a76ce99b37ae65d
parent67cd7fd0a21be58b924b8d05d182d8cab2ea4948
parentaa2bfc9b7fc1a1b7264624f749158fad986d18b5
Merge branch 'master' into 0.11

Conflicts:
docs/plugins/gstreamer-plugins.hierarchy
docs/plugins/gstreamer-plugins.args
gst/gstpreset.c