From: Stéphane Jacob <sj@m4x.org>
Date: Sat, 16 Jun 2012 17:55:30 +0000 (+0200)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.6~34
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=5ca0a2863c4d7e72fe00d7c8ff98475864216ab8;p=platal.git

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

5ca0a2863c4d7e72fe00d7c8ff98475864216ab8