Merge branch 'vmtrace'

diff --cc org/simgrid/msg/Task.java
index a81e8fc,e5e5fbf..59c103b
--- 1/org/simgrid/msg/Task.java
--- 2/org/simgrid/msg/Task.java
+++ b/org/simgrid/msg/Task.java
@@@ -277,7 -289,18 +289,19 @@@ public class Task 
         */
        public static native void nativeInit();
        static {
 +              Msg.nativeInit();
                nativeInit();
        }
+ 
+       public double getMessageSize() {
+               return this.messageSize;
+       }
+ 
+       public Long getId() {
+               return id;
+       }
+ 
+       public void setId(Long id) {
+               this.id = id;
+       }
  }

diff --cc org/simgrid/trace/Trace.java
Simple merge

diff --cc src/smx_context_cojava.c
Simple merge