From: Navarrop <Pierre.Navarro@imag.fr>
Date: Fri, 8 Apr 2011 09:15:21 +0000 (+0200)
Subject: Merge commit '521daa8271ac2778d8b2944be25daae65d3540a1' into test
X-Git-Tag: v3.6_beta2~59^2~19
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/6e4502cc095f2eca8335a00ebc3d626b5c192211

Merge commit '521daa8271ac2778d8b2944be25daae65d3540a1' into test
---

6e4502cc095f2eca8335a00ebc3d626b5c192211