Merge tag 'v3_10_rc2'

Conflicts:
	CMakeLists.txt
	ChangeLog

diff --cc ChangeLog
index c451e1f,0b9ae9e..0fa5331
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,4 +1,14 @@@
- SimGrid (3.10-rc1) unstable; urgency=low
 +SimGrid (3.11) NOT RELEASED; urgency=low
 +
 + TENTATIVE RELEASE GOALS for 3.11:
 + * Consider the removal of Supernovae mode if no user has manifested since the
 +   release of version 3.10.
 + * Switch to tesh.pl, and kill the now unused parts of xbt that seem fragile
 + * Switch to surf++, and reintegrate the hypervisor branch on top of it
 +
 + -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 +
+ SimGrid (3.10-rc2) unstable; urgency=low
  
   The Clean Diaper Release, a.k.a. SimGrid is leak-free.