Merge branch 'toufic' of github.com:Takishipp/simgrid

diff --cc src/instr/instr_TI_trace.cpp
Simple merge

diff --cc src/instr/instr_config.cpp
Simple merge

diff --cc src/instr/instr_paje_containers.cpp
Simple merge

diff --cc src/msg/instr_msg_process.cpp
Simple merge

diff --cc src/msg/msg_vm.cpp
Simple merge

diff --cc src/smpi/colls/smpi_automatic_selector.cpp
Simple merge

diff --cc src/smpi/instr_smpi.cpp
Simple merge

diff --cc src/surf/instr_routing.cpp
Simple merge