From: thiery <thiery@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 2 Dec 2010 17:19:03 +0000 (+0000)
Subject: Resolve a conflict
X-Git-Tag: v3.6_beta2~1001
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/29611f876b36be03e26c33879d0e1a72db6090f1?hp=29611f876b36be03e26c33879d0e1a72db6090f1

Resolve a conflict

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8913 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---