From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 16 Nov 2008 20:54:21 +0000 (+0100)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~496
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=3fdcece4a5eba30e33e6bad164952d9b797813df;p=platal.git

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

3fdcece4a5eba30e33e6bad164952d9b797813df