Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Mon, 27 Oct 2008 12:02:21 +0000 (13:02 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Mon, 27 Oct 2008 12:02:21 +0000 (13:02 +0100)
commit547ba3a6d496e6a2363578455b5635f96647a1ac
tree5278776c1111648f38944b29ff93e37398ff8b89
parent68059736c69a174266bde22b9877d848b844ad40
parentf1b1720edc4226d3c4f5b0cb36bc7096d157496e
Automated merge with http://gredler.at/hg/olsrd