Merge branch 'master' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Fri, 13 Jun 2008 12:59:32 +0000 (14:59 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Fri, 13 Jun 2008 12:59:32 +0000 (14:59 +0200)

Trivial merge