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

Trivial merge