merge with http://gredler.at/hg/olsrd
authorHannes Gredler <hannes@gredler.at>
Sun, 6 Apr 2008 20:32:12 +0000 (22:32 +0200)
committerHannes Gredler <hannes@gredler.at>
Sun, 6 Apr 2008 20:32:12 +0000 (22:32 +0200)

Trivial merge