From: alebre <adrien.lebre@inria.fr>
Date: Thu, 31 Jan 2013 18:15:19 +0000 (+0100)
Subject: fix conflict
X-Git-Tag: v3_11_beta~297^2^2~120
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/bc6f1e7b9d719525da623e633c9e8283e9e6a84a?hp=-c

fix conflict
---

bc6f1e7b9d719525da623e633c9e8283e9e6a84a