From: Vincent Zanotti <vincent.zanotti@polytechnique.org>
Date: Sat, 9 Aug 2008 17:55:06 +0000 (+0200)
Subject: Merge commit 'origin/master' into hruid
X-Git-Tag: xorg/0.10.0~86^2~45
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=a1cec8694f46c786d38564105711d78abc39c187;p=platal.git

Merge commit 'origin/master' into hruid

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

a1cec8694f46c786d38564105711d78abc39c187