Merge commit 'origin/master' into fusionax
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 19 Oct 2008 03:15:42 +0000 (05:15 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 19 Oct 2008 03:15:42 +0000 (05:15 +0200)

Trivial merge