AA: base-files: merge r36942

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36961 3c298f89-4303-0410-b956-a3cf2f4a3e73
AA: firewall: merge r36960

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