AA: backport r36865

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36866 3c298f89-4303-0410-b956-a3cf2f4a3e73