Merge branch 'master' of ssh://git.onelab.eu/git/tests
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 15 Sep 2011 12:27:38 +0000 (14:27 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 15 Sep 2011 12:27:38 +0000 (14:27 +0200)

Trivial merge