From: Stéphane Jacob Date: Mon, 28 Mar 2011 13:04:50 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.1~138 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=3d964835e8ff04f0f86c80aea026b82896cb4a46;p=platal.git Merge branch 'xorg/maint' into xorg/master --- 3d964835e8ff04f0f86c80aea026b82896cb4a46