Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Sun, 23 Nov 2008 21:24:00 +0000 (22:24 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Sun, 23 Nov 2008 21:24:00 +0000 (22:24 +0100)

Trivial merge