From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 21 Dec 2008 18:11:16 +0000 (+0100)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~344^2~60
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=4b239f6e6cb26cdd814b42f3efcbcae40fa862a4;p=platal.git

Merge commit 'origin/master' into fusionax
---

4b239f6e6cb26cdd814b42f3efcbcae40fa862a4