From: Takahiro Hirofuchi <t.hirofuchi+sg@aist.go.jp>
Date: Thu, 21 Feb 2013 14:10:11 +0000 (+0100)
Subject: Merge branch 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor
X-Git-Tag: v3_11_beta~297^2^2~74
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4e78565ea6b354a0e6250a87b483f909665a0ac3

Merge branch 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor

sync again
---

4e78565ea6b354a0e6250a87b483f909665a0ac3