From: Stéphane Jacob <sj@m4x.org>
Date: Mon, 16 May 2011 08:07:44 +0000 (+0200)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.2~87
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=85fd04406cd481f50ce9326adce1ec3201c55478;p=platal.git

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

85fd04406cd481f50ce9326adce1ec3201c55478