From: Stéphane Jacob <sj@m4x.org>
Date: Sun, 4 Dec 2011 15:04:28 +0000 (+0100)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.5~70
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=8b8d8e64be3a5fe9fe38a5b23c12cd1aa8529bdd;p=platal.git

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

8b8d8e64be3a5fe9fe38a5b23c12cd1aa8529bdd