Automated merge with http://olsrd.sf.net/hg/olsrd
Automated merge with http://olsrd.sf.net/hg/olsrd

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