From: Stéphane Jacob <jacou@melix.net>
Date: Sat, 13 Dec 2008 17:24:35 +0000 (+0100)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~344^2~73
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=2504be33ed7e7436c428f188bdafa9e72248131d;p=platal.git

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

2504be33ed7e7436c428f188bdafa9e72248131d