From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Thu, 2 Dec 2010 21:05:10 +0000 (+0100)
Subject: Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master
X-Git-Tag: xorg/1.0.2~111
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=7f7b00425f9cb2dc2a611cd1ca985813893d5bfe;p=platal.git

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

7f7b00425f9cb2dc2a611cd1ca985813893d5bfe