Merge branch 'gstreamer1.0'
authorPhilip Chimento <philip.chimento@gmail.com>
Mon, 28 Oct 2013 05:40:38 +0000 (22:40 -0700)
committerPhilip Chimento <philip.chimento@gmail.com>
Mon, 28 Oct 2013 05:40:38 +0000 (22:40 -0700)

Trivial merge