From: Stéphane Jacob <sj@m4x.org>
Date: Tue, 20 Jul 2010 09:39:51 +0000 (+0200)
Subject: Merge remote branch 'origin/platal-1.0.0'
X-Git-Tag: xorg/1.0.1~307
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=7c4ae1c3d38d458ac3b6dea25ca76ebdd2c0ecd8;p=platal.git

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

7c4ae1c3d38d458ac3b6dea25ca76ebdd2c0ecd8