Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Fri, 14 Nov 2008 13:55:17 +0000 (14:55 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Fri, 14 Nov 2008 13:55:17 +0000 (14:55 +0100)

Trivial merge