Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Mon, 27 Oct 2008 23:17:14 +0000 (00:17 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Mon, 27 Oct 2008 23:17:14 +0000 (00:17 +0100)

Trivial merge