From: Stéphane Jacob Date: Mon, 12 Sep 2011 15:12:04 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.4~177 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=df330f4c92bd73cc99fb5a12ec156426db819399;p=platal.git Merge branch 'xorg/maint' into xorg/master --- df330f4c92bd73cc99fb5a12ec156426db819399