Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Sun, 9 Nov 2008 17:33:47 +0000 (18:33 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Sun, 9 Nov 2008 17:33:47 +0000 (18:33 +0100)

Trivial merge