From: Pierre-Nicolas Clauss <pini@ethernium.org>
Date: Fri, 13 May 2011 13:21:05 +0000 (+0200)
Subject: Merge back master branch.
X-Git-Tag: exp_20120216~195^2~50
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/46c7981905414e7342d681be4f10709f8ef4009e

Merge back master branch.
---

46c7981905414e7342d681be4f10709f8ef4009e