From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Thu, 9 Dec 2010 21:31:43 +0000 (+0100)
Subject: Merge branch 'xorg/maint' into xorg/1.0.2/master
X-Git-Tag: xorg/1.0.2~88
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=4d9b63f8ec02d84eabd554234a32718758bf9e21;p=platal.git

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

4d9b63f8ec02d84eabd554234a32718758bf9e21