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

Trivial merge