From: Takahiro Hirofuchi <t.hirofuchi+sg@aist.go.jp>
Date: Wed, 24 Apr 2013 16:01:23 +0000 (+0200)
Subject: merge from the java bindings work
X-Git-Tag: v3_11_beta~297^2^2~40
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c078a363724fe8ef749dfbda30f09b5f471643f7

merge from the java bindings work

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

c078a363724fe8ef749dfbda30f09b5f471643f7