Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Sun, 23 Nov 2008 21:24:00 +0000 (22:24 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Sun, 23 Nov 2008 21:24:00 +0000 (22:24 +0100)
commit15fa645b462715bf2433890d9664f9f7e00c2ad4
tree73da4902b65a844d026320082ce864dcf012e5a9
parent5e621eb58a7159fce6bc41dc80a0ef0ffbca0fc4
parent6637d0cbc86b36125d22077f4a3ffdf0433d64c0
Automated merge with http://gredler.at/hg/olsrd