Merge branch 'master' of github.com:simgrid/simgrid

diff --cc src/msg/instr_msg_task.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/smpi/smpi_replay.cpp
Simple merge

diff --cc src/xbt/log.c
index 84aef42,44af691..2fc6aea
--- 1/src/xbt/log.c
--- 2/src/xbt/log.c
+++ b/src/xbt/log.c
@@@ -146,9 -145,11 +145,9 @@@ static void xbt_log_connect_categories(
    XBT_LOG_CONNECT(instr_resource);
    XBT_LOG_CONNECT(instr_routing);
    XBT_LOG_CONNECT(instr_surf);
 -  XBT_LOG_CONNECT(instr_trace);
 -  XBT_LOG_CONNECT(instr_TI_trace);
  
    /* jedule */
- #if HAVE_JEDULE
+ #if SIMGRID_HAVE_JEDULE
    XBT_LOG_CONNECT(jedule);
    XBT_LOG_CONNECT(jed_sd);
  #endif

diff --cc tools/cmake/DefinePackages.cmake
Simple merge