From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Fri, 16 Nov 2012 22:10:20 +0000 (+0100)
Subject: Merge xorg/maint into xorg/master
X-Git-Tag: xorg/1.1.7~29
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=5080ccc85fd85bc2e3d06f152830c26509b8b8d8;p=platal.git

Merge xorg/maint into xorg/master
---

5080ccc85fd85bc2e3d06f152830c26509b8b8d8