Merge commit 'origin/hruid'
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sat, 18 Oct 2008 14:56:46 +0000 (16:56 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sat, 18 Oct 2008 14:56:46 +0000 (16:56 +0200)

Trivial merge