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