From: Stéphane Jacob Date: Tue, 29 Mar 2011 19:35:10 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.1~135 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=d47dc66aaefe08eb4a8e65888dd499d85a6beb55;p=platal.git Merge branch 'xorg/maint' into xorg/master --- d47dc66aaefe08eb4a8e65888dd499d85a6beb55