Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Mon, 15 Sep 2008 21:59:01 +0000 (23:59 +0200)
committerBernd Petrovitsch <bernd@firmix.at>
Mon, 15 Sep 2008 21:59:01 +0000 (23:59 +0200)

Trivial merge