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

Trivial merge