Merge branch 'master' of ssh://git.onelab.eu/git/tests
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 15 Jul 2010 08:49:50 +0000 (10:49 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 15 Jul 2010 08:49:50 +0000 (10:49 +0200)

Trivial merge