Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-base
authorMichael Smith <msmith@rdio.com>
Wed, 3 Oct 2012 17:45:26 +0000 (10:45 -0700)
committerMichael Smith <msmith@rdio.com>
Wed, 3 Oct 2012 17:45:26 +0000 (10:45 -0700)

Trivial merge