From: Stéphane Jacob Date: Tue, 10 May 2011 19:48:13 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.2~98 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=eae1c10a6f7ce483f6bbc107e68189bcddfcafe9;p=platal.git Merge branch 'xorg/maint' into xorg/master --- eae1c10a6f7ce483f6bbc107e68189bcddfcafe9