From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Thu, 17 Jan 2013 13:19:44 +0000 (+0100)
Subject: Merge branch 'master' into vmtrace
X-Git-Tag: v3_9_rc1~84
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/100b1380c49e7e88e1faf2b7314515acf4f635fd?hp=--cc

Merge branch 'master' into vmtrace
---

100b1380c49e7e88e1faf2b7314515acf4f635fd