From: Vincent Zanotti <vincent.zanotti@polytechnique.org>
Date: Sun, 19 Oct 2008 03:15:42 +0000 (+0200)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~502
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;ds=sidebyside;h=1760b3f7f98eabdd4506211ce17be472734e6192;p=platal.git

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

1760b3f7f98eabdd4506211ce17be472734e6192