From: Stéphane Jacob <sj@m4x.org>
Date: Sun, 10 Jun 2012 16:38:13 +0000 (+0200)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.6~39
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=60fcf4a4e745bcca53baf3789f6eb67047447651;p=platal.git

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

60fcf4a4e745bcca53baf3789f6eb67047447651