Merge branch 'mc' into mc++

diff --cc src/mc/mc_global.c
Simple merge

diff --cc src/mc/mc_private.h
Simple merge

diff --cc src/xbt/mmalloc/mm_diff.c
Simple merge