Merge branch 'master' of git://olsr.org/olsrd
authorHenning Rogge <hrogge@googlemail.com>
Tue, 23 Mar 2010 20:28:35 +0000 (21:28 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Tue, 23 Mar 2010 20:28:35 +0000 (21:28 +0100)

Trivial merge