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

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

c52be69950d31821a8a091f08ad9170e1042eaf8