Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-bad
authorJosep Torra <n770galaxy@gmail.com>
Wed, 4 Feb 2009 15:18:27 +0000 (16:18 +0100)
committerJosep Torra <n770galaxy@gmail.com>
Wed, 4 Feb 2009 15:18:27 +0000 (16:18 +0100)

Trivial merge