From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 16 Jan 2011 16:45:30 +0000 (+0100)
Subject: Merge branch 'xorg/maint' into xorg/1.0.2/master
X-Git-Tag: xorg/1.0.2~32
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=164566891eef6e4027b2dfccda0040d37f10605b;p=platal.git

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

164566891eef6e4027b2dfccda0040d37f10605b