Merge commit 'origin/master' into fusionax
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 22 Dec 2008 10:40:30 +0000 (11:40 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 22 Dec 2008 10:40:30 +0000 (11:40 +0100)

Trivial merge