From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 22 Aug 2010 16:07:52 +0000 (+0200)
Subject: Merge remote branch 'origin/platal-1.0.0'
X-Git-Tag: xorg/1.0.1~256
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=ed92ea696e042eb9b2d0efcc4731fdf89fb17924;p=platal.git

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

ed92ea696e042eb9b2d0efcc4731fdf89fb17924