Merge branch 'gstreamer-1.6'
authorGilles Dartiguelongue <eva@gentoo.org>
Sun, 25 Oct 2015 23:00:54 +0000 (00:00 +0100)
committerGilles Dartiguelongue <eva@gentoo.org>
Sun, 25 Oct 2015 23:00:54 +0000 (00:00 +0100)

Trivial merge