Merge commit 'origin/core-1.0.0' into core
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 20 Dec 2008 17:12:34 +0000 (18:12 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 20 Dec 2008 17:12:34 +0000 (18:12 +0100)

Trivial merge