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

diff --cc .gitignore
index 6093dcf,219c49c..6c39838
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -179,8 -178,9 +179,8 @@@ examples/msg/trace-route-user-variables
  examples/msg/trace-link-user-variables/trace-link-user-variables
  examples/msg/trace-masterworker/trace-masterworker
  examples/msg/trace-process-migration/trace-process-migration
 -examples/msg/trace-simple/trace-simple
  examples/msg/trace-platform/trace-platform
- examples/msg/trace-user-variables/trace-user-variables
+ examples/msg/trace-host-user-variables/trace-host-user-variables
  examples/s4u/basic/s4u_basic
  examples/s4u/io/s4u_io
  examples/simdag/daxload/sd_daxload

diff --cc examples/msg/CMakeLists.txt
index b6e8d4a,4a07977..683fc99
--- 1/examples/msg/CMakeLists.txt
--- 2/examples/msg/CMakeLists.txt
+++ b/examples/msg/CMakeLists.txt
@@@ -1,10 -1,10 +1,10 @@@
  foreach(x actions-comm actions-storage app-masterworker app-pingpong app-pmm app-token-ring async-wait async-waitall 
            async-waitany cloud-capping cloud-masterworker cloud-migration cloud-multicore cloud-simple cloud-two-tasks
            dht-chord dht-pastry energy-consumption energy-onoff energy-pstate energy-ptask energy-vm platform-failures 
 -          io-file io-remote io-storage task-priority process-kill process-migration process-suspend 
 +          io-file io-remote io-storage task-priority process-create process-kill process-migration process-suspend 
            platform-properties maestro-set process-startkilltime synchro-semaphore trace-categories 
-           trace-link-srcdst-user-variables trace-link-user-variables trace-masterworker trace-platform 
-           trace-process-migration trace-user-variables)
+           trace-route-user-variables trace-link-user-variables trace-masterworker trace-platform 
 -          trace-process-migration trace-simple trace-host-user-variables)
++          trace-process-migration trace-host-user-variables)
    add_executable       (${x}     ${x}/${x}.c)
    target_link_libraries(${x}     simgrid)
    set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})

diff --cc examples/msg/README.doc
Simple merge