Merge branch 'master' of ssh://git.onelab.eu/git/tests
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 7 Oct 2010 09:13:50 +0000 (11:13 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 7 Oct 2010 09:13:50 +0000 (11:13 +0200)

Trivial merge