merge patches from Bjørn Mork

http://patchwork.ozlabs.org/patch/459277/



Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 45327