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

diff --cc teshsuite/msg/host_on_off_processes/host_on_off_processes.c
index 537e596,740a95c..0aa4cbf
--- 1/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
--- 2/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
+++ b/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
@@@ -221,7 -222,7 +221,7 @@@ int main(int argc, char *argv[]
  
    unsigned int iter;
    char *groups;
--  xbt_dynar_t s_tests = xbt_str_split(argv[3], ",");
++  xbt_dynar_t s_tests = xbt_str_split(argv[2], ",");
    int tmp_test = 0;
    tests = xbt_dynar_new(sizeof(int), NULL);
    xbt_dynar_foreach(s_tests, iter, groups) {