From: Stéphane Jacob <sj@m4x.org>
Date: Sun, 10 Jul 2011 21:45:02 +0000 (+0200)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.3~47
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=166ae27cbb59e826d23b34fc5c73dce3572e8122;p=platal.git

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

166ae27cbb59e826d23b34fc5c73dce3572e8122