Merge branch 'master' of git://olsr.org/olsrd