Merge branch 'core-1.0.0' into core
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 11 Dec 2008 22:07:54 +0000 (23:07 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 11 Dec 2008 22:07:54 +0000 (23:07 +0100)

Trivial merge