From: Florent Bruneau <florent.bruneau@intersec.com>
Date: Sun, 27 Mar 2011 14:33:39 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.1~139
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=a5122b6480994a35fe6c0d88ccd9c6dfff761364;p=platal.git

Merge remote-tracking branch 'origin/xorg/maint' into xorg/master
---

a5122b6480994a35fe6c0d88ccd9c6dfff761364