Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Sun, 7 Sep 2008 20:22:14 +0000 (22:22 +0200)
committerBernd Petrovitsch <bernd@firmix.at>
Sun, 7 Sep 2008 20:22:14 +0000 (22:22 +0200)

Trivial merge