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