Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Thu, 27 Nov 2008 09:56:13 +0000 (10:56 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Thu, 27 Nov 2008 09:56:13 +0000 (10:56 +0100)

Trivial merge