From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sat, 27 Nov 2010 21:11:05 +0000 (+0100)
Subject: Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master
X-Git-Tag: xorg/1.0.2~130
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=a56d07946f1a18c6615add3030fca02a55a34f57;p=platal.git

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

a56d07946f1a18c6615add3030fca02a55a34f57