Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-base
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 22 Jan 2009 12:12:02 +0000 (13:12 +0100)
committerWim Taymans <wim@wtay.(none)>
Thu, 22 Jan 2009 12:12:02 +0000 (13:12 +0100)

Trivial merge