From: Jonathan Rouzaud-Cornabas <jonathan.rouzaud-cornabas@ens-lyon.fr>
Date: Wed, 16 Jan 2013 23:19:37 +0000 (+0100)
Subject: Merge branch 'vmtrace'
X-Git-Tag: v3_9_rc1~84^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f1d8a21970271bffe95aca7e5b9d7c357bcb4766?hp=--cc

Merge branch 'vmtrace'
---

f1d8a21970271bffe95aca7e5b9d7c357bcb4766