Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Mon, 10 Nov 2008 23:33:54 +0000 (00:33 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Mon, 10 Nov 2008 23:33:54 +0000 (00:33 +0100)
commita63680f32bdffb4449098b6115db3fe5af935a8a
treec7ee3ee7438be648394f1195937f074628c5cd66
parentb9aa6516f3c74c3e32edc30f2083ae7b45b7bb9b
parentba705747b40ffa487dc31c3ed78a570de39e5878
Automated merge with http://gredler.at/hg/olsrd