olsrd: change name of PID-file for olsrd4 from '/var/run/olsrd4.pid' to '/var/run/olsrd.pid' to be compatible with freifunk-watchdog-scripts (this is the default old behaviour)
Merge branch 'master' of git://github.com/openwrt-routing/packages