Merge http://olsr.org/git/oonf