Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Sun, 16 Nov 2008 21:11:08 +0000 (22:11 +0100)
committerBernd Petrovitsch <bernd@firmix.at>
Sun, 16 Nov 2008 21:11:08 +0000 (22:11 +0100)
commitfc6de042dd3b42c5190bdb86725f161ee908f23c
tree60ed84cb0464dbd854bebdc4517bf7b0ed50a619
parentec98b9dabdd968b8644360b68c083452980e6aa6
parent4f32f40b5da39fc7304d8ee33fcefaf1f0cb23a2
Automated merge with http://gredler.at/hg/olsrd