Merge remote-tracking branch 'openwrt/master' into libdmapsharing
authorW. Michael Petullo <mike@flyn.org>
Sun, 10 Aug 2014 18:34:54 +0000 (14:34 -0400)
committerW. Michael Petullo <mike@flyn.org>
Sun, 10 Aug 2014 18:34:54 +0000 (14:34 -0400)

Trivial merge