Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gstreamer
authorChristian Schaller <christian.schaller@collabora.co.uk>
Thu, 7 Jan 2010 13:48:24 +0000 (13:48 +0000)
committerChristian Schaller <christian.schaller@collabora.co.uk>
Thu, 7 Jan 2010 13:48:24 +0000 (13:48 +0000)

Trivial merge