From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Thu, 1 Jul 2010 08:35:43 +0000 (+0200)
Subject: Merge branch 'platal-1.0.0'
X-Git-Tag: xorg/1.0.1~373
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=77d4417766e20c5b2b33613f1198893d470ba6b2;p=platal.git

Merge branch 'platal-1.0.0'
---

77d4417766e20c5b2b33613f1198893d470ba6b2