From: Stéphane Jacob <sj@m4x.org>
Date: Sun, 13 Dec 2009 17:49:06 +0000 (+0100)
Subject: Merge commit 'origin/platal-0.10.2'
X-Git-Tag: xorg/1.0.0~342
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=7c7d62fce3e3973b576ffbc4051ba443d6a6b849;p=platal.git

Merge commit 'origin/platal-0.10.2'
---

7c7d62fce3e3973b576ffbc4051ba443d6a6b849