Automated merge with http://gredler.at/hg/olsrd/
authorHannes Gredler <hannes@gredler.at>
Mon, 19 May 2008 12:34:23 +0000 (14:34 +0200)
committerHannes Gredler <hannes@gredler.at>
Mon, 19 May 2008 12:34:23 +0000 (14:34 +0200)

Trivial merge