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)
commit9f1319367492756f10e829892ab8fa4e00f940eb
tree66adad27c60db0c8ba940c8b612bbc2d41c5ebae
parenta73406427f72e0fdb5f93a11292d4f6a0338ad30
parent07d4bd71f4f51ad79a4bb1ea5b72ee7c1ea79d44
Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gstreamer