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

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

cf81c359b80ad4280a0b3719e0a32c8adba2549d