Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Wed, 26 Nov 2008 11:59:52 +0000 (12:59 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Wed, 26 Nov 2008 11:59:52 +0000 (12:59 +0100)

Trivial merge