Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Tue, 25 Nov 2008 23:35:02 +0000 (00:35 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Tue, 25 Nov 2008 23:35:02 +0000 (00:35 +0100)
commit8352ef4b1bd85397acf62c44db4ee6b9c2e66457
treee306265097977773d38ebcf4c8b2f6bf300d71fb
parent0b422b9574d7461a54faf6203f68ed384c4747e2
parent403710eeabf7dde07f4a6cfbf38d4d23b1b19541
Automated merge with http://gredler.at/hg/olsrd