Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Mon, 27 Oct 2008 12:02:21 +0000 (13:02 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Mon, 27 Oct 2008 12:02:21 +0000 (13:02 +0100)

Trivial merge