Automated merge with http://gredler.at/hg/olsrd/
authorHannes Gredler <hannes@gredler.at>
Thu, 12 Jun 2008 07:24:07 +0000 (09:24 +0200)
committerHannes Gredler <hannes@gredler.at>
Thu, 12 Jun 2008 07:24:07 +0000 (09:24 +0200)
commit21baca2b29a58079f45f98f467018983ee8f09f5
tree9a8642d310f47136f85410a8224bf4b909d1da0d
parentcbf2d2d06c407bd03fa546328656a4953efef211
parentfa0b309b68d3c04321d6a7157ec5a17b5ee48f0e
Automated merge with http://gredler.at/hg/olsrd/