Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 7 Feb 2009 00:21:53 +0000 (01:21 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 7 Feb 2009 00:21:53 +0000 (01:21 +0100)

Trivial merge