Merge branch 'stable' of git://193.238.157.30/olsrd into stable
authorHenning Rogge <hrogge@googlemail.com>
Thu, 3 Feb 2011 18:20:06 +0000 (19:20 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Thu, 3 Feb 2011 18:20:06 +0000 (19:20 +0100)

Trivial merge