Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Mon, 10 Nov 2008 23:33:54 +0000 (00:33 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Mon, 10 Nov 2008 23:33:54 +0000 (00:33 +0100)

Trivial merge