Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-good...
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 6 Dec 2010 16:28:32 +0000 (17:28 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 6 Dec 2010 16:28:32 +0000 (17:28 +0100)

Trivial merge