Merge branch 'iptables-upnpfw' into core67-merge

diff --combined src/initscripts/init.d/firewall
index e54ecedc6b1dc7dc194954354c974805f54720e4,38e67e0856916730c49251a3fb209de45f20c13e..cc6b6190eb8ecb7c376934b1aa74968915c46c6c
--- 1/src/initscripts/init.d/firewall
--- 2/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@@ -252,6 -252,7 +252,7 @@@ case "$1" i
        # upnp chain for our upnp daemon
        /sbin/iptables -t nat -N UPNPFW
        /sbin/iptables -t nat -A PREROUTING -j UPNPFW
+       /sbin/iptables -A FORWARD -m state --state NEW -j UPNPFW
        # This chain only contains dummy rules.
        /sbin/iptables -N UPNPFW
  
@@@ -335,9 -336,7 +336,9 @@@
        ;;
    restart)
        $0 stop
 +      $0 stopovpn
        $0 start
 +      $0 startovpn
        ;;
    *)
          echo "Usage: $0 {start|stop|reload|restart}"