Merge pull request #35 from nolith/olsrd_conf_fix