From: Jonathan Rouzaud-Cornabas <jonathan.rouzaud-cornabas@ens-lyon.fr>
Date: Wed, 16 Jan 2013 17:40:54 +0000 (+0100)
Subject: Fix failed merge
X-Git-Tag: v3_9_rc1~84^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2d930fd4960af33c07d94ddb874f7503bab264f0?hp=2d930fd4960af33c07d94ddb874f7503bab264f0

Fix failed merge
---