From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Tue, 11 Oct 2011 20:38:14 +0000 (+0200)
Subject: Merge remote branch 'origin/xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.4~94
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=5289c142e04219cb8e846c86ccd9f5005d7d49e1;p=platal.git

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

5289c142e04219cb8e846c86ccd9f5005d7d49e1