Merge branch 'master' of http://olsr.org/git/olsrd
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Mon, 14 Jun 2010 06:21:16 +0000 (08:21 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Mon, 14 Jun 2010 06:21:16 +0000 (08:21 +0200)

Trivial merge