[patches] rebase olsr patch