From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Fri, 30 Nov 2012 08:54:47 +0000 (+0100)
Subject: Merge xorg/maint into xorg/master
X-Git-Tag: xorg/1.1.7~26
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=c612f10b36afce432821101b4f6a919e3a9f2d22;p=platal.git

Merge xorg/maint into xorg/master
---

c612f10b36afce432821101b4f6a919e3a9f2d22