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

diff --cc examples/msg/properties/msg_prop.c
index 3489071,5b36d02..051ba16
--- 1/examples/msg/properties/msg_prop.c
--- 2/examples/msg/properties/msg_prop.c
+++ b/examples/msg/properties/msg_prop.c
@@@ -51,10 -50,10 +51,10 @@@ static void test_host(const char*hostna
    XBT_INFO("   Property: %s old value: %s", exist, value);
  
    XBT_INFO("== Trying to modify a host property");
-   xbt_dict_set(props, exist, xbt_strdup("250"), xbt_free_f);
+   xbt_dict_set(props, exist, xbt_strdup("250"), NULL);
  
    /* Test if we have changed the value */
 -  value = MSG_host_get_property_value(host1, exist);
 +  value = MSG_host_get_property_value(thehost, exist);
    xbt_assert(value, "Property %s is undefined (where it should)", exist);
    xbt_assert(!strcmp(value, "250"),
                "Value of property %s is defined to %s (where it should be 250)",