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)
commit872bb6e31bfaafa550a37b152821fcad3e18dc4c
tree2215d181b30ba8316e3932e27ee37d2ab1774085
parentb1ed06f44c363ea2dc38c69f2d60aae5a3def11b
parent808219cff0735c70eeb12240c6634eab89716067
Automated merge with http://gredler.at/hg/olsrd