Automated merge with http://gredler.at/hg/olsrd/