Merge commit 'origin/master' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sat, 19 Jul 2008 13:26:50 +0000 (15:26 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sat, 19 Jul 2008 13:26:50 +0000 (15:26 +0200)

Trivial merge