From: Stéphane Jacob Date: Sun, 3 Apr 2011 12:43:56 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.1~129 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=1773c63489f9bf9b3ed3a96b97f3d4f176400fa4;p=platal.git Merge branch 'xorg/maint' into xorg/master --- 1773c63489f9bf9b3ed3a96b97f3d4f176400fa4