Merged with olsrd development tree