From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sat, 14 Aug 2010 08:57:06 +0000 (+0200)
Subject: Merge branch 'platal-1.0.0'
X-Git-Tag: xorg/1.0.1~271
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=4abb0fe4bcefc73a18891e9768640d8811a09acc;p=platal.git

Merge branch 'platal-1.0.0'
---

4abb0fe4bcefc73a18891e9768640d8811a09acc