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

diff --cc src/include/surf/surf.h
Simple merge

diff --cc src/msg/msg_global.c
index f57aeaa,8c891e9..71b5db5
--- 1/src/msg/msg_global.c
--- 2/src/msg/msg_global.c
+++ b/src/msg/msg_global.c
@@@ -71,9 -71,8 +71,9 @@@ void MSG_init_nocheck(int *argc, char *
  
    XBT_DEBUG("ADD MSG LEVELS");
    MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_destroy);
 +  MSG_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, (void_f_pvoid_t) __MSG_storage_destroy);
  
-   atexit(MSG_exit);
+   if(sg_cfg_get_boolean("clean_atexit")) atexit(MSG_exit);
  }
  
  #ifdef MSG_USE_DEPRECATED

diff --cc src/simdag/sd_workstation.c
Simple merge

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