Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Sat, 18 Oct 2008 20:53:53 +0000 (22:53 +0200)
committerBernd Petrovitsch <bernd@firmix.at>
Sat, 18 Oct 2008 20:53:53 +0000 (22:53 +0200)

Trivial merge