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

diff --combined tools/gras/struct_diff.c
index 5e41d31,7cc2c3e..9c78251
--- 1/tools/gras/struct_diff.c
--- 2/tools/gras/struct_diff.c
+++ b/tools/gras/struct_diff.c
@@@ -16,6 -16,7 +16,7 @@@
  
  #include "xbt.h"
  #include "xbt/datadesc.h"
+ #include "xbt/file_stat.h"
  #include "../../src/xbt/datadesc/datadesc_private.h" // RAAAAH! ugly relative path, but it's late, I want it to be done NOW.
  #include "simix/datatypes.h"
  #include "../../src/simix/smx_smurf_private.h" // RAAAAH! ugly relative path, but it's even later and it still doesn't work
@@@ -126,7 -127,7 +127,7 @@@ int main(int argc, char** argv) 
      exit(1);
    }
  
 -  parse_from_file("s_smx_simcall_t");
 +//  parse_from_file("s_smx_simcall_t");
    parse_from_file(argv[1]);
  
    int cpt;