Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 20 May 2011 10:26:57 +0000 (12:26 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 20 May 2011 10:26:57 +0000 (12:26 +0200)
commita9b134d1a94584bbaf9ea06a46b3271f9486d529
treefc5d23b92e68a23c58afd126146ff8f99e52b59f
parentf1980aa051909770b3335ae2ca84dfba21be128b
parent9b8992cbf16c6e51960579b7d6b2b7e7bee8b36a
Merge branch 'master' into 0.11

Conflicts:
docs/plugins/gst-plugins-base-plugins.hierarchy
docs/plugins/gst-plugins-base-plugins.interfaces
docs/plugins/gst-plugins-base-plugins.prerequisites
gst/audioconvert/gstaudioconvert.c
gst/encoding/gstencodebin.c