Merge branch 'master' of git://olsr.org/olsrd
authorMitar <mitar@tnode.com>
Sat, 10 Apr 2010 20:07:16 +0000 (22:07 +0200)
committerMitar <mitar@tnode.com>
Sat, 10 Apr 2010 20:07:16 +0000 (22:07 +0200)

Trivial merge