From: Pierre Nicolas CLAUSS <pnclauss@griffon-82.nancy.grid5000.fr>
Date: Thu, 28 Jul 2011 08:49:07 +0000 (+0000)
Subject: Merge branch 'master' into smpi
X-Git-Tag: exp_20120216~195^2~34
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/49cb11c26e1ebc2b3042f78e6c4638d6d5403e3b

Merge branch 'master' into smpi
---

49cb11c26e1ebc2b3042f78e6c4638d6d5403e3b