Merge branch 'master' into xbt_random

diff --combined tools/cmake/DefinePackages.cmake
index 385a7e4,c50a3de..d084dd1
--- 1/tools/cmake/DefinePackages.cmake
--- 2/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -43,6 -43,7 +43,7 @@@ set(EXTRA_DIS
    src/surf/network_ns3.hpp
    src/surf/network_smpi.hpp
    src/surf/network_ib.hpp
+   src/surf/network_wifi.hpp
    src/surf/ns3/ns3_simulator.hpp
    src/surf/xml/simgrid.dtd
    src/surf/xml/simgrid_dtd.h
@@@ -282,7 -283,6 +283,7 @@@ set(XBT_SR
    src/xbt/memory_map.hpp
    src/xbt/OsSemaphore.hpp
    src/xbt/parmap.cpp
 +  src/xbt/random.cpp
    src/xbt/snprintf.c
    src/xbt/string.cpp
    src/xbt/xbt_log_appender_file.cpp
@@@ -349,6 -349,7 +350,7 @@@ set(SURF_SR
    src/surf/network_cm02.cpp
    src/surf/network_constant.cpp
    src/surf/network_interface.cpp
+   src/surf/network_wifi.cpp
    src/surf/PropertyHolder.cpp
    src/surf/sg_platf.cpp
    src/surf/StorageImpl.cpp
@@@ -773,7 -774,6 +775,7 @@@ set(headers_to_instal
    include/xbt/module.h
    include/xbt/parmap.h
    include/xbt/range.hpp
 +  include/xbt/random.hpp
    include/xbt/replay.hpp
    include/xbt/signal.hpp
    include/xbt/str.h