From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 16 Jan 2011 16:45:48 +0000 (+0100)
Subject: Merge branch 'xorg/1.0.2/master' into xorg/master
X-Git-Tag: xorg/1.1.0~191
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=a1c554a92888e0b017ba362817a67cc2849a9154;p=platal.git

Merge branch 'xorg/1.0.2/master' into xorg/master
---

a1c554a92888e0b017ba362817a67cc2849a9154