Merge branch 'master' of http://olsr.org/git/olsrd
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Fri, 29 Oct 2010 11:13:09 +0000 (13:13 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Fri, 29 Oct 2010 11:13:09 +0000 (13:13 +0200)

Trivial merge