From: Stéphane Jacob <sj@m4x.org>
Date: Fri, 16 Jul 2010 22:18:54 +0000 (+0200)
Subject: Merge remote branch 'origin/platal-1.0.0'
X-Git-Tag: xorg/1.0.1~334
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=ba879af870d71163785c12ae4f4e7a070c6e614e;p=platal.git

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

ba879af870d71163785c12ae4f4e7a070c6e614e