Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Thu, 18 Sep 2008 22:12:28 +0000 (00:12 +0200)
committerBernd Petrovitsch <bernd@firmix.at>
Thu, 18 Sep 2008 22:12:28 +0000 (00:12 +0200)
commite180376d9ec1ac214e7c5a125d9a39a481d430a0
treed2fae08fefd5eee84b99c2b785f9c3830f6cda5e
parentf21b1d9e63d67262a18bf55e620802e3f65e07e1
parentb1ed06f44c363ea2dc38c69f2d60aae5a3def11b
Automated merge with http://gredler.at/hg/olsrd