Merge commit 'origin/master' into fusionax
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 15 Aug 2008 12:54:59 +0000 (14:54 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 15 Aug 2008 12:54:59 +0000 (14:54 +0200)

Trivial merge