Merge branch 'stable' of git://193.238.157.30/olsrd into stable
authorHenning Rogge <hrogge@googlemail.com>
Sun, 5 Sep 2010 08:08:29 +0000 (10:08 +0200)
committerHenning Rogge <hrogge@googlemail.com>
Sun, 5 Sep 2010 08:08:29 +0000 (10:08 +0200)

Trivial merge