Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Wed, 26 Nov 2008 11:59:52 +0000 (12:59 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Wed, 26 Nov 2008 11:59:52 +0000 (12:59 +0100)
commit3dbb775cc0296a1861df29055a2ae3a9762bee2e
tree710e78f1c67cff2160fd87ebc4ef7a99d578297e
parent010596a612eb7f1db9fb14744b040c3b3243663d
parent89b663a41890a95b7b894927f269c6e0edc2b643
Automated merge with http://gredler.at/hg/olsrd