Merge branch 'master' of ssh://uraeus@git.freedesktop.org/git/gstreamer/gst-plugins-bad
authorChristian Schaller <christian.schaller@collabora.co.uk>
Thu, 30 Apr 2009 16:29:35 +0000 (17:29 +0100)
committerChristian Schaller <christian.schaller@collabora.co.uk>
Thu, 30 Apr 2009 16:29:35 +0000 (17:29 +0100)

Trivial merge