Merge pull request #253 from SvenRoederer/olsrd/remove-6and4