Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Sun, 23 Nov 2008 14:04:44 +0000 (15:04 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Sun, 23 Nov 2008 14:04:44 +0000 (15:04 +0100)
commita11f82db06e733c4632691099ca2bab038786306
tree5a205969b0cfd4e0bd79f2be5c278a2ae21d6b04
parentdb980b9136b57e1b6a60d184cfdd827ed7d2477f
parentaf52b780aa16b7a9da24846401a1864742d70749
Automated merge with http://gredler.at/hg/olsrd