From: Christophe Thiéry <christopho128@gmail.com>
Date: Fri, 6 Jan 2012 09:26:02 +0000 (+0100)
Subject: Merge branch 'smpi'
X-Git-Tag: exp_20120216~195
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7d8a6180b3769b53adbe4600df95074763141495

Merge branch 'smpi'
---

7d8a6180b3769b53adbe4600df95074763141495