Merge branch 'master' of git://olsr.org/framework
authorHenning Rogge <hrogge@googlemail.com>
Tue, 20 Mar 2012 18:07:30 +0000 (19:07 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Tue, 20 Mar 2012 18:07:30 +0000 (19:07 +0100)

Trivial merge