Merge commit '4df273f15273f959fc9e6ed69d2bf5e607ec9bf7' into HEAD

diff --combined org/simgrid/trace/Trace.java
index be6f085,ede59a5..7943ed4
--- 1/org/simgrid/trace/Trace.java
--- 2/org/simgrid/trace/Trace.java
+++ b/org/simgrid/trace/Trace.java
@@@ -10,12 -10,9 +10,12 @@@
   */
  package org.simgrid.trace;
  
 +import org.simgrid.msg.Msg;
 +
  public final class Trace {
        /* Statically load the library which contains all native functions used in here */
        static {
 +              Msg.nativeInit();
                try {
                        System.loadLibrary("SG_java_tracing");
                } catch(UnsatisfiedLinkError e) {
@@@ -301,4 -298,21 +301,21 @@@
         * @param value
         */
        public final static native      void hostVariableSet (String host, String variable, double value);
+ 
+       /**
+        * Declare a new user variable associated to VMs. 
+        * 
+        * @param variable
+        */
+       public final static native      void vmVariableDeclare (String variable);
+  
+ 
+       /**
+        * Set the value of a variable of a VM. 
+        * 
+        * @param host
+        * @param variable
+        * @param value
+        */
+       public final static native      void vmVariableSet (String vm, String variable, double value);
  }