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