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

diff --cc examples/smpi/NAS/ep.c
index 33aa77e,28696c2..81707f2
--- 1/examples/smpi/NAS/ep.c
--- 2/examples/smpi/NAS/ep.c
+++ b/examples/smpi/NAS/ep.c
@@@ -60,9 -70,10 +60,9 @@@ int main(int argc, char **argv) 
    if (node == root ) {
      /* Because the size of the problem is too large to store in a 32-bit integer for some classes, we put it into a
       * string (for printing). Have to strip off the decimal point put in there by the floating point print statement
 -     * (internal file)
 -     */
 +     * (internal file) */
      fprintf(stdout," NAS Parallel Benchmarks 3.2 -- EP Benchmark");
-     sprintf(size,"%zu",(unsigned long)pow(2,m+1));
+     sprintf(size,"%lu",(unsigned long)pow(2,m+1));
      //size = size.replace('.', ' ');
      fprintf(stdout," Number of random numbers generated: %s\n",size);
      fprintf(stdout," Number of active processes: %d\n",no_nodes);

diff --cc examples/smpi/NAS/nas_common.c
Simple merge

diff --cc examples/smpi/NAS/nas_common.h
Simple merge