From: Stéphane Jacob <sj@m4x.org>
Date: Fri, 30 Oct 2009 15:46:48 +0000 (+0100)
Subject: Merge commit 'origin/platal-0.10.1'
X-Git-Tag: xorg/0.10.2~33
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=be5a4adb62c3abe6c12fb020cf321bdb244ebc4b;p=platal.git

Merge commit 'origin/platal-0.10.1'
---

be5a4adb62c3abe6c12fb020cf321bdb244ebc4b