From: Stéphane Jacob Date: Fri, 22 Apr 2011 13:12:20 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.1~71 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=9756357a151d461e49699938c8baee6ec81f1611;p=platal.git Merge branch 'xorg/maint' into xorg/master --- 9756357a151d461e49699938c8baee6ec81f1611