Merge branch 'stable' of git://olsr.org/olsrd into stable
authorMarkus Kittenberger <markus@markit.unassigned-domain>
Tue, 9 Nov 2010 09:12:18 +0000 (10:12 +0100)
committerMarkus Kittenberger <markus@markit.unassigned-domain>
Tue, 9 Nov 2010 09:12:18 +0000 (10:12 +0100)

Trivial merge