merge changes. Strange, it seems to ate pierre commit

diff --cc src/include/surf/surfxml_parse_values.h
index 715a94f,ee41fff..8a25ca1
--- 1/src/include/surf/surfxml_parse_values.h
--- 2/src/include/surf/surfxml_parse_values.h
+++ b/src/include/surf/surfxml_parse_values.h
@@@ -75,8 -75,13 +75,13 @@@ extern surf_parsing_cluster_arg_t struc
  extern surf_parsing_peer_arg_t struct_peer;
  extern surf_parsing_link_arg_t struct_lnk;
  
 -void STag_surfxml_host_cluster(void);
 -void STag_surfxml_link_cluster(void);
+ typedef struct s_surf_parsing_link_up_down *surf_parsing_link_up_down_t;
+ typedef struct s_surf_parsing_link_up_down {
+       void* link_up;
+       void* link_down;
+ } s_surf_parsing_link_up_down_t;
+ 
 +void surf_parse_host(void);
 +void surf_parse_link(void);
  
- 
  #endif /* SURFXML_PARSE_VALUES_H_ */

diff --cc src/surf/surf_routing.c
index 8435506,9c7b5fb..dfef12f
--- 1/src/surf/surf_routing.c
--- 2/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@@ -1742,15 -1687,16 +1834,16 @@@ void routing_parse_Scluster(void
          if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED)
                  struct_lnk->V_policy_initial_link = SURF_LINK_SHARED;
          else
-         {
-          if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE)
-                  struct_lnk->V_policy_initial_link = SURF_LINK_FATPIPE;
-          else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
-                  struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX;
-         }
+                 struct_lnk->V_policy_initial_link = SURF_LINK_FATPIPE;
  
 -        STag_surfxml_link_cluster();
 +        surf_parse_link();
          ETag_surfxml_link();
+ 
+         surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1);
+         info->link_up   = xbt_lib_get_or_null(link_lib, link_backbone, SURF_LINK_LEVEL);
+         info->link_down = info->link_up;
+         xbt_dict_set(cluster_host_link,struct_cluster->V_cluster_id,info,xbt_free);
+         free(link_backbone);
    }
  
    XBT_DEBUG(" ");