From: Stéphane Jacob <sj@m4x.org>
Date: Thu, 7 Jul 2011 08:47:55 +0000 (+0200)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.3~52
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=8e202451b08f0e0fc38d180d4b7cf33328ec8290;p=platal.git

Merge branch 'xorg/maint' into xorg/master
---

8e202451b08f0e0fc38d180d4b7cf33328ec8290