From: Pierre-Nicolas Clauss <pierre-nicolas.clauss@loria.fr>
Date: Tue, 19 Jul 2011 12:38:11 +0000 (+0200)
Subject: Merge back master branch.
X-Git-Tag: exp_20120216~195^2~35
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/66b0686fe441796325c3b5738b1b880d15ce1ea6

Merge back master branch.

Conflicts:
	src/smpi/smpi_base.c
---

66b0686fe441796325c3b5738b1b880d15ce1ea6