Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Tue, 25 Nov 2008 00:21:54 +0000 (01:21 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Tue, 25 Nov 2008 00:21:54 +0000 (01:21 +0100)

Trivial merge