Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-base
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 25 Jan 2010 12:18:18 +0000 (13:18 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 25 Jan 2010 12:18:18 +0000 (13:18 +0100)

Trivial merge