Merge branch 'master' of ssh://git.onelab.eu/git/tests
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 10 Feb 2012 10:38:23 +0000 (11:38 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 10 Feb 2012 10:38:23 +0000 (11:38 +0100)

Trivial merge