From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Wed, 4 Mar 2009 22:06:53 +0000 (+0100)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~344^2~3
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=950a769bb3f3154de64960ffc5cac111263bc8b0;p=platal.git

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

950a769bb3f3154de64960ffc5cac111263bc8b0