Automated merge with http://olsrd.sf.net/hg/olsrd
authorHannes Gredler <hannes@gredler.at>
Wed, 5 Mar 2008 09:57:47 +0000 (10:57 +0100)
committerHannes Gredler <hannes@gredler.at>
Wed, 5 Mar 2008 09:57:47 +0000 (10:57 +0100)

Trivial merge