From: Stéphane Jacob <sj@m4x.org>
Date: Wed, 29 Dec 2010 01:40:59 +0000 (+0100)
Subject: Merge branch 'xorg/1.0.2/master'
X-Git-Tag: xorg/1.1.0~250
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=81120a6fae8573d4d333ab9009f57efa81b55c7e;p=platal.git

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

81120a6fae8573d4d333ab9009f57efa81b55c7e