From: Pierre-Nicolas Clauss <pini@tuxfamily.org>
Date: Tue, 29 Mar 2011 12:18:26 +0000 (+0200)
Subject: Merge remote branch 'github/master'
X-Git-Tag: exp_20120216~559^2^2~3^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7467ec77e1cd62ec60a343a75f25f2b1f77baac5?hp=-c

Merge remote branch 'github/master'
---

7467ec77e1cd62ec60a343a75f25f2b1f77baac5