Merge commit 'origin/master' into fusionax
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 4 Mar 2009 22:06:53 +0000 (23:06 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 4 Mar 2009 22:06:53 +0000 (23:06 +0100)

Trivial merge