From: Stéphane Jacob <sj@m4x.org>
Date: Mon, 12 Dec 2011 11:45:49 +0000 (+0100)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.5~56
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=c65aed9897893d27bc93744c801d289724ef5b7b;p=platal.git

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

c65aed9897893d27bc93744c801d289724ef5b7b