From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Mon, 17 May 2010 19:53:38 +0000 (+0200)
Subject: Merge branch 'platal-0.10.2'
X-Git-Tag: xorg/1.0.0~254
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=00ca0ad5370df5be4a0272364fb16a4385ffabfe;p=platal.git

Merge branch 'platal-0.10.2'
---

00ca0ad5370df5be4a0272364fb16a4385ffabfe