From: Stéphane Jacob <jacou@melix.net>
Date: Sun, 14 Sep 2008 17:44:28 +0000 (+0200)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~515
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=7972436ae72911c7f2e8d5f3a26204a7ca0ee39d;p=platal.git

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

7972436ae72911c7f2e8d5f3a26204a7ca0ee39d