Merge branch 'master' of ssh://git.onelab.eu/git/tests
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 24 May 2012 08:17:07 +0000 (10:17 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 24 May 2012 08:17:07 +0000 (10:17 +0200)

Trivial merge