Merge branch 'master' into mq

diff --combined MANIFEST.in
index 2a24cda,610932b..f2f6e1d
--- 1/MANIFEST.in
--- 2/MANIFEST.in
+++ b/MANIFEST.in
@@@ -330,8 -330,6 +330,8 @@@ include examples/cpp/mc-failing-assert/
  include examples/cpp/mc-failing-assert/s4u-mc-failing-assert-statequality.tesh
  include examples/cpp/mc-failing-assert/s4u-mc-failing-assert.cpp
  include examples/cpp/mc-failing-assert/s4u-mc-failing-assert.tesh
 +include examples/cpp/mess-wait/s4u-mess-wait.cpp
 +include examples/cpp/mess-wait/s4u-mess-wait.tesh
  include examples/cpp/network-factors/s4u-network-factors.cpp
  include examples/cpp/network-factors/s4u-network-factors.tesh
  include examples/cpp/network-nonlinear/s4u-network-nonlinear.cpp
@@@ -645,9 -643,12 +645,12 @@@ include examples/smpi/trace_call_locati
  include examples/smpi/trace_call_location/trace_call_location.tesh
  include examples/smpi/trace_simple/trace_simple.c
  include examples/smpi/trace_simple/trace_simple.tesh
+ include examples/sthread/pthread-mc-mutex-recursive.tesh
  include examples/sthread/pthread-mc-mutex-simple.tesh
  include examples/sthread/pthread-mc-mutex-simpledeadlock.tesh
  include examples/sthread/pthread-mc-producer-consumer.tesh
+ include examples/sthread/pthread-mutex-recursive.c
+ include examples/sthread/pthread-mutex-recursive.tesh
  include examples/sthread/pthread-mutex-simple.c
  include examples/sthread/pthread-mutex-simple.tesh
  include examples/sthread/pthread-mutex-simpledeadlock.c
@@@ -1968,7 -1969,6 +1971,7 @@@ include include/simgrid/s4u/Host.hp
  include include/simgrid/s4u/Io.hpp
  include include/simgrid/s4u/Link.hpp
  include include/simgrid/s4u/Mailbox.hpp
 +include include/simgrid/s4u/MessageQueue.hpp
  include include/simgrid/s4u/Mutex.hpp
  include include/simgrid/s4u/NetZone.hpp
  include include/simgrid/s4u/Semaphore.hpp
@@@ -2065,10 -2065,6 +2068,10 @@@ include src/kernel/activity/IoImpl.cp
  include src/kernel/activity/IoImpl.hpp
  include src/kernel/activity/MailboxImpl.cpp
  include src/kernel/activity/MailboxImpl.hpp
 +include src/kernel/activity/MessImpl.cpp
 +include src/kernel/activity/MessImpl.hpp
 +include src/kernel/activity/MessageQueueImpl.cpp
 +include src/kernel/activity/MessageQueueImpl.hpp
  include src/kernel/activity/MutexImpl.cpp
  include src/kernel/activity/MutexImpl.hpp
  include src/kernel/activity/SemaphoreImpl.cpp
@@@ -2353,8 -2349,6 +2356,8 @@@ include src/s4u/s4u_Host.cp
  include src/s4u/s4u_Io.cpp
  include src/s4u/s4u_Link.cpp
  include src/s4u/s4u_Mailbox.cpp
 +include src/s4u/s4u_Mess.cpp
 +include src/s4u/s4u_MessageQueue.cpp
  include src/s4u/s4u_Mutex.cpp
  include src/s4u/s4u_Netzone.cpp
  include src/s4u/s4u_Semaphore.cpp