olsrd: Merge branch 'olsrd_6and4' by Alessio Caiazza.