Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Sun, 23 Nov 2008 21:25:25 +0000 (22:25 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Sun, 23 Nov 2008 21:25:25 +0000 (22:25 +0100)
commit845d52a88e1ee17ddc43d0d1ecb5e21a174d97de
tree445c5cdc6c5e78cd4c1054c9f87bfbe399f54ae0
parent3c64ec8cb4bfcf830e94ae445ea572e0e5d2272d
parentd2355fce40b457db79b0b95a2f5bb3f601adc394
Automated merge with http://gredler.at/hg/olsrd