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

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

d645ceb701b0e8aa1de2e5271bed35e56ef169f1