Automated merge with http://olsrd.sf.net/hg/olsrd
authorHannes Gredler <hannes@gredler.at>
Mon, 5 May 2008 09:13:00 +0000 (11:13 +0200)
committerHannes Gredler <hannes@gredler.at>
Mon, 5 May 2008 09:13:00 +0000 (11:13 +0200)

Trivial merge