Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --combined include/simgrid/s4u/VirtualMachine.hpp
index 94af590,d455e56..6bcf4f0
--- 1/include/simgrid/s4u/VirtualMachine.hpp
--- 2/include/simgrid/s4u/VirtualMachine.hpp
+++ b/include/simgrid/s4u/VirtualMachine.hpp
@@@ -27,8 -27,8 +27,8 @@@ namespace s4u 
   *
   * @tableofcontents
   *
-  * A VM is a virtual machine that contains actors. The total computing power that the contained
-  * processes can get is constrained to the virtual machine size.
+  * A VM represents a virtual machine (or a container) that hosts actors.
+  * The total computing power that the contained actors can get is constrained to the virtual machine size.
   *
   */
  XBT_PUBLIC_CLASS VirtualMachine : public s4u::Host
@@@ -56,7 -56,6 +56,7 @@@ public
    simgrid::s4u::Host* getPm();
    size_t getRamsize();
    void setRamsize(size_t ramsize);
 +  void setBound(double bound);
  
    e_surf_vm_state_t getState();