From: Takahiro Hirofuchi <t.hirofuchi+sg@aist.go.jp>
Date: Fri, 28 Jun 2013 15:47:17 +0000 (+0200)
Subject: Merge branch 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor
X-Git-Tag: v3_11_beta~297^2^2~28
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/15badc71ce964f6dae6428c9a4c0198fad5d4936?hp=-c

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

15badc71ce964f6dae6428c9a4c0198fad5d4936