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