Merge branch 'master' into disk

diff --cc MANIFEST.in
index 20c7891,d7db729..736fc92
--- 1/MANIFEST.in
--- 2/MANIFEST.in
+++ b/MANIFEST.in
@@@ -1832,9 -1836,9 +1836,10 @@@ include examples/platforms/energy_platf
  include examples/platforms/faulty_host.xml
  include examples/platforms/g5k.xml
  include examples/platforms/griffon.xml
 +include examples/platforms/hosts_with_disks.xml
  include examples/platforms/meta_cluster.xml
  include examples/platforms/multicore_machine.xml
+ include examples/platforms/ns3-big-cluster.xml
  include examples/platforms/onelink.xml
  include examples/platforms/optorsim/gridpp_grid_2004.conf
  include examples/platforms/optorsim/lcg_sept2004_grid.conf

diff --cc tools/cmake/DefinePackages.cmake
index 888b0e1,03ca63e..642e972
--- 1/tools/cmake/DefinePackages.cmake
--- 2/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -1137,9 -1132,9 +1138,10 @@@ set(PLATFORMS_EXAMPLE
    examples/platforms/faulty_host.xml
    examples/platforms/g5k.xml
    examples/platforms/griffon.xml
 +  examples/platforms/hosts_with_disks.xml
    examples/platforms/meta_cluster.xml
    examples/platforms/multicore_machine.xml
+   examples/platforms/ns3-big-cluster.xml
    examples/platforms/onelink.xml
    examples/platforms/prop.xml
    examples/platforms/routing_cluster.xml