Merge branch 'gstreamer1' of https://github.com/MikePetullo/packages
authorTed Hess <thess@kitschensync.net>
Thu, 7 Aug 2014 17:09:39 +0000 (13:09 -0400)
committerTed Hess <thess@kitschensync.net>
Thu, 7 Aug 2014 17:09:39 +0000 (13:09 -0400)

Trivial merge