Merge commit 'origin/master' into fusionax
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 21 Dec 2008 18:11:16 +0000 (19:11 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 21 Dec 2008 18:11:16 +0000 (19:11 +0100)

Trivial merge