From: Stéphane Jacob <sj@m4x.org>
Date: Fri, 13 May 2011 09:10:09 +0000 (+0200)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.2~95
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=18d4bfef9ab67ed8a83fd04f7b2cbf51ef97b02f;p=platal.git

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

18d4bfef9ab67ed8a83fd04f7b2cbf51ef97b02f