From: Pierre-Nicolas Clauss <pini@tuxfamily.org>
Date: Tue, 29 Mar 2011 11:53:03 +0000 (+0200)
Subject: Merge remote branch 'github/master'
X-Git-Tag: exp_20120216~559^2^2~3^2~1^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4e15915b16d6979d0adee835bb25a1f5b16c758b

Merge remote branch 'github/master'
---

4e15915b16d6979d0adee835bb25a1f5b16c758b