From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Fri, 9 Sep 2011 22:37:24 +0000 (+0200)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.3~1
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=d89a495539357b3ad30f7b891bd23d1805355a52;p=platal.git

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

d89a495539357b3ad30f7b891bd23d1805355a52