Merge branch 'master' into MC_LTL

Conflicts:
	buildtools/Cmake/DefinePackages.cmake

diff --combined buildtools/Cmake/DefinePackages.cmake
index e2e3abb,4708dd7..d163aaf
--- 1/buildtools/Cmake/DefinePackages.cmake
--- 2/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@@ -16,8 -16,6 +16,7 @@@ set(EXTRA_DIS
        src/xbt/backtrace_windows.c
        src/xbt/backtrace_dummy.c
        src/xbt/setset_private.h
-       src/xbt/parmap_private.h
 +      src/xbt/automatonparse_promela.c
        src/xbt/mmalloc/attach.c
        src/xbt/mmalloc/detach.c        
        src/xbt/mmalloc/keys.c
@@@ -181,7 -179,6 +180,7 @@@ set(XBT_SR
        src/xbt/parmap.c
        src/xbt/xbt_replay_trace_reader.c
        src/xbt/lib.c
 +      src/xbt/automaton.c
  )
  
  if(HAVE_MMAP)
@@@ -370,7 -367,6 +369,7 @@@ set(MC_SR
        src/mc/mc_dpor.c
        src/mc/mc_request.c
        src/mc/private.h
 +      src/mc/mc_liveness.c
  )
  
  set(RNGSTREAM_SRC
@@@ -413,8 -409,6 +412,8 @@@ set(headers_to_instal
        include/xbt/mmalloc.h
        include/xbt/replay_trace_reader.h
        include/xbt/parmap.h
 +      include/xbt/automaton.h
 +      include/xbt/automatonparse_promela.h
        include/simgrid/platf.h
        include/mc/modelchecker.h
        include/msg/msg.h