Merge branches 'master' and 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --combined tools/cmake/DefinePackages.cmake
index de42ac2,a1a26fa..c66284e
--- 1/tools/cmake/DefinePackages.cmake
--- 2/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -81,7 -81,7 +81,7 @@@ set(EXTRA_DIS
    src/surf/surf_private.h
    src/surf/surf_routing.hpp
    src/surf/PropertyHolder.hpp
 -  src/surf/virtual_machine.hpp
 +  src/surf/VirtualMachineImpl.hpp
    src/surf/host_clm03.hpp
    src/surf/HostImpl.hpp
    src/surf/ptask_L07.hpp
@@@ -332,7 -332,7 +332,7 @@@ set(SURF_SR
    src/surf/xml/surfxml_parseplatf.cpp
    src/surf/trace_mgr.hpp
    src/surf/trace_mgr.cpp
 -  src/surf/virtual_machine.cpp
 +  src/surf/VirtualMachineImpl.cpp
    src/surf/host_clm03.cpp
    src/surf/HostImpl.cpp
    src/surf/ptask_L07.cpp
@@@ -391,7 -391,6 +391,7 @@@ set(S4U_SR
    src/s4u/s4u_mutex.cpp
    src/s4u/s4u_conditionVariable.cpp
    src/s4u/s4u_storage.cpp
 +  src/s4u/s4u_VirtualMachine.cpp
  )
  
  set(SIMGRID_SRC
@@@ -654,7 -653,6 +654,7 @@@ set(headers_to_instal
    include/simgrid/s4u/Mutex.hpp
    include/simgrid/s4u/conditionVariable.hpp
    include/simgrid/s4u/storage.hpp  
 +  include/simgrid/s4u/VirtualMachine.hpp  
    include/simgrid/s4u.hpp
    include/simgrid/plugins/energy.h
    include/smpi/mpi.h
@@@ -999,7 -997,6 +999,6 @@@ set(CMAKE_SOURCE_FILE
    tools/cmake/Java.cmake
    tools/cmake/MakeLib.cmake
    tools/cmake/MakeLibWin.cmake
-   tools/cmake/Modules/FindGFortran.cmake
    tools/cmake/Modules/FindGraphviz.cmake
    tools/cmake/Modules/FindLibdw.cmake
    tools/cmake/Modules/FindLibunwind.cmake