reserve merge conflicts from latest sf.net pull
reserve merge conflicts from latest sf.net pull

diogomg/olsrd,cl4u2/olsrd-wot-pgp,brabander/olsr,acinonyx/olsrd,duydb2/olsr,nolith/olsrd,zioproto/olsrd,zioproto/olsrd,cholin/olsrd,tdz/olsrd,diogomg/olsrd,sebkur/olsrd,brabander/olsr,cholin/olsrd,ralisi/olsrd_cl_roam,diogomg/olsrd-binary-heap,nolith/olsrd,servalproject/olsr,sebkur/olsrd,zioproto/olsrd,diogomg/olsrd-binary-heap,diogomg/olsrd-binary-heap,duydb2/olsr,zioproto/olsrd-gsoc2012,brabander/olsr,brabander/olsr,ralisi/olsrd_cl_roam,cl4u2/olsrd-wot-pgp,diogomg/olsrd-binary-heap,acinonyx/olsrd,sauloqueiroz/incremental-spf,tdz/olsrd,ralisi/olsrd_cl_roam,cl4u2/olsrd-wot-pgp,sebkur/olsrd,sauloqueiroz/incremental-spf,diogomg/olsrd,ninuxorg/olsrd,nolith/olsrd,diogomg/olsrd,cholin/olsrd,diogomg/olsrd,zioproto/olsrd,diogomg/olsrd-binary-heap,nolith/olsrd,zioproto/olsrd-gsoc2012,duydb2/olsr,servalproject/olsr,servalproject/olsr,diogomg/olsrd,tdz/olsrd,cholin/olsrd,diogomg/olsrd-binary-heap,tdz/olsrd,ninuxorg/olsrd,acinonyx/olsrd,ralisi/olsrd_cl_roam,tdz/olsrd,zioproto/olsrd-gsoc2012,cholin/olsrd,servalproject/olsr,cl4u2/olsrd-wot-pgp,duydb2/olsr,sauloqueiroz/incremental-spf,sauloqueiroz/incremental-spf,diogomg/olsrd-binary-heap,zioproto/olsrd-gsoc2012,servalproject/olsr,sebkur/olsrd,zioproto/olsrd-gsoc2012,zioproto/olsrd-gsoc2012,ninuxorg/olsrd,diogomg/olsrd,duydb2/olsr,ninuxorg/olsrd,zioproto/olsrd,duydb2/olsr,acinonyx/olsrd,ninuxorg/olsrd,servalproject/olsr,acinonyx/olsrd,duydb2/olsr,cl4u2/olsrd-wot-pgp,sebkur/olsrd,nolith/olsrd,sebkur/olsrd,duydb2/olsr