Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-bad
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 29 Mar 2012 16:04:36 +0000 (18:04 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 29 Mar 2012 16:04:36 +0000 (18:04 +0200)

Trivial merge