Merge branch 'master' of git://olsr.org/olsrd
authorHenning Rogge <henning@henning-notebook.fritz.box>
Sun, 16 May 2010 15:03:48 +0000 (17:03 +0200)
committerHenning Rogge <henning@henning-notebook.fritz.box>
Sun, 16 May 2010 15:03:48 +0000 (17:03 +0200)

Trivial merge