From: Stéphane Jacob <sj@m4x.org>
Date: Mon, 4 Apr 2011 14:36:41 +0000 (+0200)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.1~123
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=54722967b9b605dca8cff67fc3a050194beba368;p=platal.git

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

54722967b9b605dca8cff67fc3a050194beba368