From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Fri, 25 Feb 2011 16:15:06 +0000 (+0100)
Subject: Merge remote branch 'origin/xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.0~140
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=d53c12097f4e82ad4657de86f199699973dee29f;p=platal.git

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

d53c12097f4e82ad4657de86f199699973dee29f