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

Trivial merge