From: Vincent Zanotti <vincent.zanotti@m4x.org>
Date: Sat, 11 Apr 2009 01:19:01 +0000 (+0200)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~337^2
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=d66464d5ea0a69c47f2f49ace9de2f4b7b8c4d62;p=platal.git

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

d66464d5ea0a69c47f2f49ace9de2f4b7b8c4d62