Automated merge with http://gredler.at/hg/olsrd
authorHannes Gredler <hannes@gredler.at>
Sat, 24 May 2008 10:39:49 +0000 (12:39 +0200)
committerHannes Gredler <hannes@gredler.at>
Sat, 24 May 2008 10:39:49 +0000 (12:39 +0200)

Trivial merge