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

Trivial merge