Automated merge with http://gredler.at/hg/olsrd/
authorHannes Gredler <hannes@gredler.at>
Thu, 12 Jun 2008 07:24:07 +0000 (09:24 +0200)
committerHannes Gredler <hannes@gredler.at>
Thu, 12 Jun 2008 07:24:07 +0000 (09:24 +0200)

Trivial merge