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

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

de14933c384281bfc5571b8b3d7d7ac94b04bc48