Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Fri, 14 Nov 2008 13:55:17 +0000 (14:55 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Fri, 14 Nov 2008 13:55:17 +0000 (14:55 +0100)
commit759a06a5ed759d901b4dc60f6e6983eb3b3046ea
treee301feb953a2d71046798b10d7f5e21ed54920f9
parentf3db86dd5d5e85eadad33e43d85adc0aceb49cd9
parenteadcc9be4327e77b44f01a19adbad6cbe018d1d7
Automated merge with http://gredler.at/hg/olsrd