Merge commit 'origin/core-1.0.0' into core
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 18 Dec 2008 22:31:25 +0000 (23:31 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 18 Dec 2008 22:31:25 +0000 (23:31 +0100)

Trivial merge