From: Stéphane Jacob <jacou@melix.net>
Date: Sun, 10 Aug 2008 20:04:40 +0000 (+0200)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~540
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=2a6cca40fb0afa2a445f2e0c2135b14069676086;p=platal.git

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

2a6cca40fb0afa2a445f2e0c2135b14069676086