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