From: Stéphane Jacob <sj@m4x.org>
Date: Wed, 26 Oct 2011 13:29:59 +0000 (+0200)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.4~55
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=ba1cbd51cd218c3a8caf6d9518df9d2367a9ae54;p=platal.git

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

ba1cbd51cd218c3a8caf6d9518df9d2367a9ae54