From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Fri, 21 Jan 2011 19:36:28 +0000 (+0100)
Subject: Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master
X-Git-Tag: xorg/1.1.0~183
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=020a95fa78dc544b3064739d409026a0056d98f4;p=platal.git

Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master
---

020a95fa78dc544b3064739d409026a0056d98f4