From: Pierre-Nicolas Clauss <pini@ethernium.org>
Date: Thu, 9 Jun 2011 08:37:42 +0000 (+0200)
Subject: Merge back master branch
X-Git-Tag: exp_20120216~195^2~41
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cf57fb58889894670e2594d2e3b6a213d8fd6089?hp=-c

Merge back master branch
---

cf57fb58889894670e2594d2e3b6a213d8fd6089