From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Mon, 29 Dec 2008 15:51:08 +0000 (+0100)
Subject: Merge commit 'origin/fusionax' into account
X-Git-Tag: xorg/1.0.0~332^2~450
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=076412639089ff7a5dfd8ae1652faf1683c322e5;p=platal.git

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

076412639089ff7a5dfd8ae1652faf1683c322e5