From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 14 Dec 2008 19:54:10 +0000 (+0100)
Subject: Merge commit 'origin/fusionax' into account
X-Git-Tag: xorg/1.0.0~332^2~485
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=54906b8dc1d98edbf5ae919a7e4413fc8c1be384;p=platal.git

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

54906b8dc1d98edbf5ae919a7e4413fc8c1be384