Merge branch 'master' of git://olsr.org/framework
authorHenning Rogge <hrogge@googlemail.com>
Wed, 18 Jan 2012 16:06:59 +0000 (17:06 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Wed, 18 Jan 2012 16:06:59 +0000 (17:06 +0100)

Trivial merge