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

diff --cc examples/msg/energy/vm/CMakeLists.txt
Simple merge

diff --cc tools/cmake/DefinePackages.cmake
index 06c0d93,00f033a..e402f08
--- 1/tools/cmake/DefinePackages.cmake
--- 2/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -1056,8 -1059,8 +1059,9 @@@ set(EXAMPLES_CMAKEFILES_TX
    examples/msg/cloud/CMakeLists.txt
    examples/msg/energy/consumption/CMakeLists.txt
    examples/msg/energy/onoff/CMakeLists.txt
+   examples/msg/energy/vm/CMakeLists.txt
    examples/msg/energy/pstate/CMakeLists.txt
 +  examples/msg/energy/vm/CMakeLists.txt
    examples/msg/exception/CMakeLists.txt
    examples/msg/gpu/CMakeLists.txt
    examples/msg/gtnets/CMakeLists.txt