Merge branch 'stable' of git://193.238.157.30/olsrd into stable
authorHenning Rogge <hrogge@googlemail.com>
Mon, 29 Nov 2010 16:45:37 +0000 (17:45 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Mon, 29 Nov 2010 16:45:37 +0000 (17:45 +0100)

Trivial merge