From: Stéphane Jacob Date: Tue, 19 Apr 2011 14:56:48 +0000 (+0200) Subject: Merge remote branch 'origin/xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.1~86 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=f9a8c549deebf96792c3ba423e01545dc7caf95b;p=platal.git Merge remote branch 'origin/xorg/maint' into xorg/master --- f9a8c549deebf96792c3ba423e01545dc7caf95b