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