AA: miniupnpd: merge r35149 and r35150

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_12.09@35151 3c298f89-4303-0410-b956-a3cf2f4a3e73