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

Conflicts:
	buildtools/Cmake/DefinePackages.cmake

diff --cc buildtools/Cmake/DefinePackages.cmake
index f238940,2b699db..7bd63de
--- 1/buildtools/Cmake/DefinePackages.cmake
--- 2/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@@ -393,7 -393,7 +393,8 @@@ endif(
  
  set(SIMGRID_SRC
    src/simgrid/sg_config.c
 +  src/simgrid/host.cpp
+   src/simgrid/util.hpp
    )
  
  set(MSG_SRC

diff --cc include/simgrid/platf.h
Simple merge

diff --cc src/surf/surf_routing.cpp
index dbde952,67ec97d..23fd809
--- 1/src/surf/surf_routing.cpp
--- 2/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@@ -515,10 -525,10 +515,10 @@@ static void elements_father(sg_routing_
   * This function is called by "get_route" and "get_latency". It allows to walk
   * recursively through the ASes tree.
   */
 -static void _get_route_and_latency(RoutingEdgePtr src, RoutingEdgePtr dst,
 +static void _get_route_and_latency(RoutingEdge *src, RoutingEdge *dst,
                                     xbt_dynar_t * links, double *latency)
  {
-   s_sg_platf_route_cbarg_t route;
+   s_sg_platf_route_cbarg_t route = SG_PLATF_ROUTE_INITIALIZER;
    memset(&route,0,sizeof(route));
  
    xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method");

diff --cc src/surf/surf_routing_cluster.cpp
Simple merge

diff --cc src/surf/surf_routing_cluster_fat_tree.cpp
Simple merge

diff --cc src/surf/surf_routing_cluster_torus.cpp
Simple merge

diff --cc src/surf/surfxml_parse.c
Simple merge