Merge commit 'origin/master' into fusionax
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 27 Dec 2008 23:24:24 +0000 (00:24 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 27 Dec 2008 23:24:24 +0000 (00:24 +0100)

Trivial merge