Merge branch 'stable' of http://olsr.org/git/olsrd into stable
authorMarkus Kittenberger <Markus.Kittenberger@gmx.at>
Wed, 16 Dec 2009 23:07:19 +0000 (00:07 +0100)
committerMarkus Kittenberger <Markus.Kittenberger@gmx.at>
Wed, 16 Dec 2009 23:07:19 +0000 (00:07 +0100)

Trivial merge