From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sat, 16 Oct 2010 18:40:05 +0000 (+0200)
Subject: Merge remote branch 'origin/platal-1.0.1'
X-Git-Tag: xorg/1.1.0~305
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=ae163e7a83670527fcc67e38b5bbc0902b7fe119;p=platal.git

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

ae163e7a83670527fcc67e38b5bbc0902b7fe119