Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gstreamer
authorChristian Fredrik Kalager Schaller <uraeus@linuxrisin.org>
Mon, 19 Nov 2012 12:16:48 +0000 (13:16 +0100)
committerChristian Fredrik Kalager Schaller <uraeus@linuxrisin.org>
Mon, 19 Nov 2012 12:16:48 +0000 (13:16 +0100)

Trivial merge