Merge branch 'stable' of git://olsr.org/olsrd into stable
authorMarkus Kittenberger <Markus.Kittenberger@gmx.at>
Fri, 19 Aug 2011 16:29:39 +0000 (18:29 +0200)
committerMarkus Kittenberger <Markus.Kittenberger@gmx.at>
Fri, 19 Aug 2011 16:29:39 +0000 (18:29 +0200)

Trivial merge