Merge commit 'origin/master' into fusionax
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 23 Nov 2008 14:45:04 +0000 (15:45 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 23 Nov 2008 14:45:04 +0000 (15:45 +0100)

Trivial merge