From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Tue, 13 Jul 2010 13:04:34 +0000 (+0200)
Subject: Merge branch 'platal-1.0.0'
X-Git-Tag: xorg/1.0.1~351
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=8def9eb54fa949fce13b35a4e26add2a8118e6aa;p=platal.git

Merge branch 'platal-1.0.0'
---

8def9eb54fa949fce13b35a4e26add2a8118e6aa