From: jean-noel quintin <jnquintin@Jean-Noels-MacBook.local>
Date: Thu, 21 Jun 2012 12:41:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: v3_8~528
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f3c1ebdb5d5e4370a0efd5f4c0dd4f7131fe8370?hp=-c

Merge remote-tracking branch 'origin/master'
---

f3c1ebdb5d5e4370a0efd5f4c0dd4f7131fe8370