From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Tue, 30 Dec 2008 22:31:31 +0000 (+0100)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~344^2~51
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=90862af65777b54eb2830b501729236fe50aa110;p=platal.git

Merge commit 'origin/master' into fusionax
---

90862af65777b54eb2830b501729236fe50aa110