From: Vincent Zanotti <vincent.zanotti@polytechnique.org>
Date: Sun, 20 Jul 2008 21:12:26 +0000 (+0200)
Subject: Merge branch 'master' into hruid
X-Git-Tag: xorg/0.10.0~86^2~53
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=6f0ed746468397c663783a89f5b3b43f6fff77e2;p=platal.git

Merge branch 'master' into hruid
---

6f0ed746468397c663783a89f5b3b43f6fff77e2