From: Stéphane Jacob Date: Wed, 21 Sep 2011 11:33:53 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.4~143 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=85b2b2257110a8c77d70624f0fa9bba402d99e5f;p=platal.git Merge branch 'xorg/maint' into xorg/master --- 85b2b2257110a8c77d70624f0fa9bba402d99e5f