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

Merge commit 'origin/master' into hruid

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
---

c886c975766cc8c3b53d3d73a4bf592824577d93