Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Sat, 22 Nov 2008 23:28:36 +0000 (00:28 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Sat, 22 Nov 2008 23:28:36 +0000 (00:28 +0100)
commitaf52b780aa16b7a9da24846401a1864742d70749
treeb2711e4a88c775617cc8b4fb36e7397e4e65cfdd
parenta63680f32bdffb4449098b6115db3fe5af935a8a
parent124b6778e0359c2112690382a2462f342fcca39a
Automated merge with http://gredler.at/hg/olsrd