From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Sat, 26 Mar 2011 09:28:19 +0000 (+0100)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.0~1
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=d82359a556779137f8a90d0312b3098a2db6f482;p=platal.git

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

d82359a556779137f8a90d0312b3098a2db6f482