From: Lucas Schnorr <Lucas.Schnorr@imag.fr>
Date: Thu, 31 Mar 2011 09:14:27 +0000 (+0200)
Subject: Merge branch 'master' into master-svn
X-Git-Tag: v3.6_beta2~85
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/20bce0939a53dd9bb3c6ea68107e9529372db19b?hp=--cc

Merge branch 'master' into master-svn
---

20bce0939a53dd9bb3c6ea68107e9529372db19b