Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-base
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 6 Jan 2010 10:33:03 +0000 (11:33 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 6 Jan 2010 10:33:03 +0000 (11:33 +0100)

Trivial merge