Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 14 Dec 2008 19:54:10 +0000 (20:54 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 14 Dec 2008 19:54:10 +0000 (20:54 +0100)

Trivial merge