From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 7 Dec 2008 15:21:53 +0000 (+0100)
Subject: Merge commit 'origin/fusionax' into account
X-Git-Tag: xorg/1.0.0~332^2~492
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=1b5926018d2e0659fd7617529b63031a5cb8e531;p=platal.git

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

1b5926018d2e0659fd7617529b63031a5cb8e531