From: Stéphane Jacob <sj@m4x.org>
Date: Thu, 31 Mar 2011 20:39:07 +0000 (+0200)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.1~133
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=ed40b531b6a8a187f49c963ed4407e72208afbb6;p=platal.git

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

ed40b531b6a8a187f49c963ed4407e72208afbb6