Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 27 Dec 2008 19:31:03 +0000 (20:31 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 27 Dec 2008 19:31:03 +0000 (20:31 +0100)

Trivial merge