From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 25 Jan 2009 21:15:56 +0000 (+0100)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~344^2~27
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=372fbb196e649a098e3c7df848f909849696ef65;p=platal.git

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

372fbb196e649a098e3c7df848f909849696ef65