Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Mon, 27 Oct 2008 23:17:14 +0000 (00:17 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Mon, 27 Oct 2008 23:17:14 +0000 (00:17 +0100)
commit9ee180b49fe9b1cc5fc988ebd7c9af32464355e8
tree7d0b821ed25214fc9610c1f83118ac07e4985d94
parentec590ec11bb010b14c45aa44f41342908fbe14c7
parent4c3cca8b7b55b398ac15589aaa8bfd617ebee9b8
Automated merge with http://gredler.at/hg/olsrd