Merge branch 'dual_socket' of git://olsr.org/olsrd into dual_socket
authorMarkus Kittenberger <Markus.Kittenberger@gmx.at>
Thu, 31 Dec 2009 19:44:09 +0000 (20:44 +0100)
committerMarkus Kittenberger <Markus.Kittenberger@gmx.at>
Thu, 31 Dec 2009 19:44:09 +0000 (20:44 +0100)

Trivial merge