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)
commitc4a205d726aef4a81e148a0de3e37ff13ea2a73d
tree9b1eed99b23ae3a79aeb39e6d343d7a3f43647d2
parent886983b435a6a5ca0d3b927aa0e091f2ed334350
parent3ed9437ae74229314085e415a6f72a676b92b466
Merge branch 'dual_socket' of git://olsr.org/olsrd into dual_socket