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

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

2d89ec936167033886ae76b153605d7ccf19bc20