Merge branch '0.11' of ssh://git.freedesktop.org/git/gstreamer/gstreamer into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 16 May 2011 14:54:02 +0000 (16:54 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 16 May 2011 14:54:02 +0000 (16:54 +0200)

Trivial merge