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

diff --combined buildtools/Cmake/DefinePackages.cmake
index e85b1bd,a518040..077919e
--- 1/buildtools/Cmake/DefinePackages.cmake
--- 2/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@@ -124,11 -124,9 +124,11 @@@ set(EXTRA_DIS
    src/xbt/win32_ucontext.c
    tools/tesh/run_context.h
    tools/tesh/tesh.h
 +  src/surf/surf_routing_cluster_fat_tree.hpp
    )
  
  set(SMPI_SRC
 +  src/surf/surf_routing_cluster_fat_tree.cpp
    src/smpi/instr_smpi.c
    src/smpi/smpi_base.c
    src/smpi/smpi_bench.c
@@@ -512,6 -510,8 +512,8 @@@ set(JSURF_JAVA_GENERATED_SR
    ${CMAKE_BINARY_DIR}/src/bindings/java/org/simgrid/surf/TmgrTraceEvent.java
    ${CMAKE_BINARY_DIR}/src/bindings/java/org/simgrid/surf/TmgrTrace.java
  
+   ${CMAKE_BINARY_DIR}/src/bindings/java/org/simgrid/surf/ActionList.java
+ 
    #enums
    ${CMAKE_BINARY_DIR}/src/bindings/java/org/simgrid/surf/ActionState.java
    ${CMAKE_BINARY_DIR}/src/bindings/java/org/simgrid/surf/ResourceState.java