From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Thu, 2 Dec 2010 21:06:05 +0000 (+0100)
Subject: Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master
X-Git-Tag: xorg/1.1.0~258
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=34c0246248ed6e3c6a372c89b359ce038bb95bc8;p=platal.git

Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master
---

34c0246248ed6e3c6a372c89b359ce038bb95bc8