From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 22 Feb 2009 14:02:47 +0000 (+0100)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~344^2~10
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=a93519575833e6886e055abb8b43b3ada6f163bc;p=platal.git

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

a93519575833e6886e055abb8b43b3ada6f163bc