Merge branch 'stable' of git://olsr.org/olsrd into stable
authorMitar <mitar@tnode.com>
Tue, 6 Jul 2010 06:47:32 +0000 (08:47 +0200)
committerMitar <mitar@tnode.com>
Tue, 6 Jul 2010 06:47:32 +0000 (08:47 +0200)

Trivial merge