From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Thu, 28 Oct 2010 21:13:39 +0000 (+0200)
Subject: Merge remote branch 'origin/platal-1.0.1'
X-Git-Tag: xorg/1.1.0~298
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=18f11744795abac7cbffc5fd967b64c55bf9d30d;p=platal.git

Merge remote branch 'origin/platal-1.0.1'
---

18f11744795abac7cbffc5fd967b64c55bf9d30d