Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Mon, 27 Oct 2008 12:07:18 +0000 (13:07 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Mon, 27 Oct 2008 12:07:18 +0000 (13:07 +0100)
commitbd362340e46d42ec584f8d85c10775782c488642
treea257e06518e018b0701c4d6eec1f7ea2ecd2ad01
parentf7f8335ea72b320572449a23e6da298d750117f1
parentd9044ecca537caaa0766c65e0c62879b617b4531
Automated merge with http://gredler.at/hg/olsrd