From: Stéphane Jacob <sj@m4x.org>
Date: Wed, 4 Jan 2012 22:47:51 +0000 (+0100)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.5~50
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=3eaeedd1621a4ad6f3b89b01dcab4143e6f27545;p=platal.git

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

3eaeedd1621a4ad6f3b89b01dcab4143e6f27545