Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Sun, 7 Sep 2008 20:22:14 +0000 (22:22 +0200)
committerBernd Petrovitsch <bernd@firmix.at>
Sun, 7 Sep 2008 20:22:14 +0000 (22:22 +0200)
commit3eec26137a86879cbd187329389cd6e3525b6ac5
tree7693f2b3dab86e1a126dbcdcf50691df26ab73c2
parent04a8127cd23f1bb70c9d3b704cb265ad3be85601
parent3978617db7897c9f75bfc568aa81f1df6bf2e303
Automated merge with http://gredler.at/hg/olsrd