From: Samuel Lepetit <samuel.lepetit@inria.fr>
Date: Tue, 12 Jun 2012 07:58:16 +0000 (+0200)
Subject: Merge scm.gforge.inria.fr:/gitroot/simgrid/simgrid-java
X-Git-Tag: v3_9_90~569^2~19^2~56^2~6
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d14a5bb9a5e3388eca71c02b8dfb487cc7db9ce5

Merge scm.gforge.inria.fr:/gitroot/simgrid/simgrid-java

Conflicts:
	src/jmsg_process.c
	src/jmsg_process.h
---

d14a5bb9a5e3388eca71c02b8dfb487cc7db9ce5