From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sat, 27 Dec 2008 23:24:24 +0000 (+0100)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~344^2~55
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=225b4e8076bb652982eb13c16b0f832a873c6b5e;p=platal.git

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

225b4e8076bb652982eb13c16b0f832a873c6b5e