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

diff --cc src/smpi/smpi_global.cpp
index f11aae6,c24494a..aad63d8
--- 1/src/smpi/smpi_global.cpp
--- 2/src/smpi/smpi_global.cpp
+++ b/src/smpi/smpi_global.cpp
@@@ -21,7 -18,7 +21,8 @@@
  #include "src/mc/mc_replay.h"
  #include "src/msg/msg_private.h"
  #include "src/simix/smx_private.h"
 +#include "src/surf/surf_interface.hpp"
+ #include "src/smpi/SmpiHost.hpp"
  #include "surf/surf.h"
  #include "xbt/replay.hpp"
  #include <xbt/config.hpp>
@@@ -509,6 -509,12 +510,10 @@@ int smpi_main(const char* executable, i
  
    SMPI_switch_data_segment = &smpi_switch_data_segment;
  
 -  smpi_init_options();
 -
+   simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
+     host.extension_set(new simgrid::smpi::SmpiHost(&host));
+   });
+ 
    // parse the platform file: get the host list
    SIMIX_create_environment(argv[1]);
    SIMIX_comm_set_copy_data_callback(smpi_comm_copy_buffer_callback);