Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --combined tools/cmake/DefinePackages.cmake
index 48e3495,a2ed64b..e1c84d7
--- 1/tools/cmake/DefinePackages.cmake
--- 2/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -609,7 -609,8 +609,8 @@@ set(MC_SR
    src/mc/mc_safety.h
    src/mc/mc_state.h
    src/mc/mc_state.cpp
-   src/mc/mc_visited.cpp
+   src/mc/VisitedState.cpp
+   src/mc/VisitedState.hpp
    src/mc/mc_client_api.cpp
    src/mc/mc_protocol.h
    src/mc/mc_protocol.cpp
@@@ -1100,7 -1101,6 +1101,7 @@@ set(PLATFORMS_EXAMPLE
    examples/platforms/syscoord/median_harvard.syscoord
    examples/platforms/syscoord/median_meridian.syscoord
    examples/platforms/syscoord/median_p2psim.syscoord
 +  examples/platforms/three_multicore_hosts.xml
    examples/platforms/torus_cluster.xml
    examples/platforms/two_hosts.xml
    examples/platforms/two_hosts_platform.xml