From: Lucas Schnorr <Lucas.Schnorr@imag.fr>
Date: Sat, 9 Apr 2011 12:45:31 +0000 (+0200)
Subject: merging tracing changes
X-Git-Tag: v3.6_beta2~59^2~11
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0d622ff31635c2228cb721abf806bb28b3cada4d?hp=-c

merging tracing changes
---

0d622ff31635c2228cb721abf806bb28b3cada4d