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

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

1f6232c64d77147f9a47e29f85dbeee71e925b0b