From: Stéphane Jacob Date: Sat, 16 Apr 2011 16:45:42 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.1~95 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=8a70ca6fac73380af967fdd9271a834be25b021e;p=platal.git Merge branch 'xorg/maint' into xorg/master --- 8a70ca6fac73380af967fdd9271a834be25b021e