From: Stéphane Jacob <sj@m4x.org>
Date: Mon, 9 Aug 2010 00:13:38 +0000 (+0200)
Subject: Merge remote branch 'origin/platal-1.0.0'
X-Git-Tag: xorg/1.0.1~274
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=843a2191e4c76f0beb00c754f06974de76791238;p=platal.git

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

843a2191e4c76f0beb00c754f06974de76791238