From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Sun, 24 Mar 2013 18:25:26 +0000 (+0100)
Subject: Merge xorg/maint into xorg/master.
X-Git-Tag: xorg/1.1.8~12
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=9981ccc71af6da6dc7f970d6c882f22966d72f4f;p=platal.git

Merge xorg/maint into xorg/master.
---

9981ccc71af6da6dc7f970d6c882f22966d72f4f