Merge branch 'master' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 20 Jul 2008 16:23:55 +0000 (18:23 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 20 Jul 2008 16:23:55 +0000 (18:23 +0200)

Trivial merge