Merge branch 'bmx6'
authorJo-Philipp Wich <jow@openwrt.org>
Thu, 18 Apr 2013 17:07:02 +0000 (19:07 +0200)
committerJo-Philipp Wich <jow@openwrt.org>
Thu, 18 Apr 2013 17:07:02 +0000 (19:07 +0200)

Trivial merge