Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Thu, 18 Sep 2008 22:12:28 +0000 (00:12 +0200)
committerBernd Petrovitsch <bernd@firmix.at>
Thu, 18 Sep 2008 22:12:28 +0000 (00:12 +0200)

Trivial merge