From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 2 Feb 2012 20:55:53 +0000 (+0100)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into LLL
X-Git-Tag: exp_20120216~74
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/00255adf47970918999b2b4495ce8a69b036e68a

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into LLL
---

00255adf47970918999b2b4495ce8a69b036e68a