Merge branch 'master' of ssh://uraeus@git.freedesktop.org/git/gstreamer/gst-plugins-bad
authorChristian Schaller <cschalle@crazyhorse.localdomain>
Wed, 4 Mar 2009 15:30:04 +0000 (15:30 +0000)
committerChristian Schaller <cschalle@crazyhorse.localdomain>
Wed, 4 Mar 2009 15:30:04 +0000 (15:30 +0000)

Trivial merge