Merge branch 'stable' of git://olsr.org/olsrd into stable
authorHenning Rogge <hrogge@googlemail.com>
Fri, 22 Jan 2010 16:30:49 +0000 (17:30 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Fri, 22 Jan 2010 16:30:49 +0000 (17:30 +0100)

Trivial merge