Merge remote-tracking branch 'openwrt/master' into gstreamer1 148/head
authorW. Michael Petullo <mike@flyn.org>
Wed, 6 Aug 2014 18:04:03 +0000 (14:04 -0400)
committerW. Michael Petullo <mike@flyn.org>
Wed, 6 Aug 2014 18:04:03 +0000 (14:04 -0400)

Trivial merge