From: Stéphane Jacob <sj@m4x.org>
Date: Mon, 2 May 2011 14:40:00 +0000 (+0200)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.1~37
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=c4f03937349bddfad25990239a825f8161615260;p=platal.git

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

c4f03937349bddfad25990239a825f8161615260