Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --cc src/smpi/internals/smpi_bench.cpp
index c3d7e18,96996c0..3ebf408
--- 1/src/smpi/internals/smpi_bench.cpp
--- 2/src/smpi/internals/smpi_bench.cpp
+++ b/src/smpi/internals/smpi_bench.cpp
@@@ -40,6 -35,8 +40,7 @@@ SharedMallocType smpi_cfg_shared_mallo
  double smpi_total_benched_time = 0;
  
  extern "C" XBT_PUBLIC void smpi_execute_flops_(double* flops);
 -extern "C" XBT_PUBLIC simgrid::config::Flag<double> smpi_wtime_sleep;
+ 
  void smpi_execute_flops_(double *flops)
  {
    smpi_execute_flops(*flops);