Merge commit 'origin/core-1.0.0' into core
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 5 Jan 2009 20:16:29 +0000 (21:16 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 5 Jan 2009 20:16:29 +0000 (21:16 +0100)

Trivial merge