From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Thu, 16 Dec 2010 20:09:39 +0000 (+0100)
Subject: Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master
X-Git-Tag: xorg/1.0.2~72
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=cafb410fea6f257f45da08631c6cdb5c35f86b17;p=platal.git

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

cafb410fea6f257f45da08631c6cdb5c35f86b17