Merge branch 'master' of ssh://git.onelab.eu/git/tests
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 23 Mar 2011 14:10:31 +0000 (15:10 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 23 Mar 2011 14:10:31 +0000 (15:10 +0100)

Trivial merge