From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 21 Mar 2010 16:09:35 +0000 (+0100)
Subject: Merge remote branch 'origin/platal-0.10.2'
X-Git-Tag: xorg/1.0.0~333
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=9e1816c7666767755abbc24f6a0df290efff81b6;p=platal.git

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

9e1816c7666767755abbc24f6a0df290efff81b6