From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Thu, 17 Jan 2013 13:16:33 +0000 (+0100)
Subject: Merge branch 'vmtrace' again (don't try to undersatand why)
X-Git-Tag: v3_9_rc1~85
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9bfa65c76083c4dfcf2ecb3b2f857585ac21f621

Merge branch 'vmtrace' again (don't try to undersatand why)
---

9bfa65c76083c4dfcf2ecb3b2f857585ac21f621