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

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

7d5c0b6878233e6009c6d765183591eefb6294d2