Merge branch 'master' of ssh://git.polytechnique.org/home/git/platal
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Wed, 16 Jan 2008 17:41:17 +0000 (18:41 +0100)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Wed, 16 Jan 2008 17:41:17 +0000 (18:41 +0100)

Trivial merge