Merge branch 'v3_8_x'

Conflicts:
	ChangeLog (fixed).

diff --cc ChangeLog
index 057bbc2,ffc5395..f458630
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,16 -1,8 +1,16 @@@
- SimGrid (3.8.1) NOT RELEASED; urgency=low
 +SimGrid (3.9) NOT RELEASED; urgency=low
 +
 + SMPI:
 + * Now works on Windows too!
 + * Much more extensive test suite, from MPICH
 +
 + -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 +
+ SimGrid (3.8.1) stable; urgency=low
  
-  (to complete)
+  * Add missing file "tesh.1" to the archive.
  
-  -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
+  -- Sat Oct 27 16:12:11 CEST 2012 Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
  
  SimGrid (3.8) stable; urgency=low
  

diff --cc NEWS
Simple merge