From: Stéphane Jacob <sj@m4x.org>
Date: Sun, 3 Jun 2012 15:57:09 +0000 (+0200)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.6~43
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=c124278e743b13724c99c08d890ea8cedaaf7534;p=platal.git

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

c124278e743b13724c99c08d890ea8cedaaf7534