Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 7 Dec 2008 17:33:43 +0000 (18:33 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 7 Dec 2008 17:33:43 +0000 (18:33 +0100)

Trivial merge