Merge branch 'stable' of git://193.238.157.30/olsrd into stable
authorHenning Rogge <hrogge@googlemail.com>
Mon, 1 Mar 2010 19:23:31 +0000 (20:23 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Mon, 1 Mar 2010 19:23:31 +0000 (20:23 +0100)

Trivial merge