Merge remote-tracking branch 'openwrt/for-14.07' into for-14.07
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Mon, 10 Aug 2015 12:10:22 +0000 (14:10 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Mon, 10 Aug 2015 12:10:22 +0000 (14:10 +0200)

Trivial merge