From: Stéphane Jacob Date: Mon, 28 Mar 2011 19:44:54 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.1~137 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=4b79fe1c1096e933feb5fdba75cb8a99a6046fdb;p=platal.git Merge branch 'xorg/maint' into xorg/master --- 4b79fe1c1096e933feb5fdba75cb8a99a6046fdb