From: Stéphane Jacob <sj@m4x.org>
Date: Fri, 7 Jan 2011 14:05:56 +0000 (+0100)
Subject: Merge branch 'xorg/1.0.2/master' into xorg/master
X-Git-Tag: xorg/1.1.0~221
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=5b48ebf46ef939d701852d2117bbcf308036027c;p=platal.git

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

5b48ebf46ef939d701852d2117bbcf308036027c