Merge branch 'master' of git://olsr.org/olsrd
authorHenning Rogge <hrogge@googlemail.com>
Fri, 23 Jul 2010 15:20:38 +0000 (17:20 +0200)
committerHenning Rogge <hrogge@googlemail.com>
Fri, 23 Jul 2010 15:20:38 +0000 (17:20 +0200)

Trivial merge