2nd half of fix from John Hay
2nd half of fix from John Hay

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