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

Trivial merge