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

diff --combined tools/cmake/DefinePackages.cmake
index 81feb43,81feb43..4be1c2f
--- 1/tools/cmake/DefinePackages.cmake
--- 2/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -1077,6 -1077,6 +1077,7 @@@ set(PLATFORMS_EXAMPLE
    examples/platforms/data_center.xml
    examples/platforms/dogbone.xml
    examples/platforms/energy_platform.xml
++  examples/platforms/energy_cluster.xml
    examples/platforms/faulty_host.xml
    examples/platforms/g5k.xml
    examples/platforms/griffon.xml