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

diff --combined buildtools/Cmake/DefinePackages.cmake
index 5dde708,948d959..ef6012d
--- 1/buildtools/Cmake/DefinePackages.cmake
--- 2/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@@ -197,7 -197,6 +197,7 @@@ set(XBT_SR
        src/xbt/xbt_socket.c
        src/xbt/xbt_socket_private.h
        src/xbt/xbt_trp_plugin_tcp.c
 +      src/xbt/RngStream.c
  )
  
  if(HAVE_MMAP)
@@@ -282,6 -281,7 +282,7 @@@ set(MSG_SR
        src/msg/msg_deployment.c
        src/msg/msg_mailbox.c
        src/msg/msg_actions.c
+       src/msg/msg_vm.c
  )
  
  set(SIMDAG_SRC
@@@ -391,6 -391,11 +392,6 @@@ set(MC_SR
        src/mc/mc_liveness.c
  )
  
 -set(RNGSTREAM_SRC
 -      src/rngstreams/RngStream.h
 -      src/rngstreams/RngStream.c
 -)
 -
  set(headers_to_install
        include/xbt/misc.h
        include/xbt/sysdep.h
@@@ -432,7 -437,6 +433,7 @@@
        include/xbt/socket.h
        include/xbt/file_stat.h
        include/xbt/xbt_os_thread.h
 +  include/xbt/RngStream.h
        include/simgrid/platf.h
        include/simgrid/modelchecker.h
        include/simgrid/simix.h
@@@ -520,6 -524,7 +521,6 @@@ set(simgrid_source
        ${AMOK_SRC}
        ${BINDINGS_SRC}
        ${JEDULE_SRC}
 -      ${RNGSTREAM_SRC}
  )
  
  if(HAVE_MC)