From: Stéphane Jacob Date: Tue, 11 Oct 2011 09:08:46 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.4~97 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=673e56aa757fce4ea57c27ab2c0d5ce87d713e51;p=platal.git Merge branch 'xorg/maint' into xorg/master --- 673e56aa757fce4ea57c27ab2c0d5ce87d713e51